diff options
Diffstat (limited to 'kpresenter/KPrPage.cpp')
| -rw-r--r-- | kpresenter/KPrPage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index fc57515d9..43469219c 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -2330,12 +2330,12 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con { o = it.toLast(); while ( o ) { - if ( o != m_doc->footer() || - o != m_doc->header() || - ( m_bHasFooter && o == m_doc->footer() ) || + if ( o != m_doc->footer() || + o != m_doc->header() || + ( m_bHasFooter && o == m_doc->footer() ) || ( m_bHasHeader && o == m_doc->header() ) ) { - if ( ( o->isSelected() || i > 0 ) && + if ( ( o->isSelected() || i > 0 ) && o->contains( pos ) && !( o->isProtect() && withoutProtected ) ) return o; } @@ -2420,10 +2420,10 @@ KCommand *KPrPage::alignVertical(VerticalAlignmentType _type ) KPrTextObject *obj = dynamic_cast<KPrTextObject *>(it.current()); if ( obj && !obj->isProtectContent()) { - KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("ChangeQt::Vertical Alignment"), + KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("Change Vertical Alignment"), obj, obj->verticalAlignment(),_type, m_doc); if ( !macro ) - macro = new KMacroCommand( i18n("ChangeQt::Vertical Alignment")); + macro = new KMacroCommand( i18n("Change Vertical Alignment")); macro->addCommand( cmd ); cmd->execute(); } |