summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrPage.cpp
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2015-03-05 05:03:32 +0100
committerSlávek Banko <[email protected]>2015-03-05 05:38:11 +0100
commit5254056d0fbc4d05dde43c7ad44c085decf8569d (patch)
tree7f90c18f437c297fe12cc19dc96914e2b8cace4a /kpresenter/KPrPage.cpp
parent0a817ecfcd6e71f30c1261d43cb4d019557dd878 (diff)
downloadkoffice-5254056d0fbc4d05dde43c7ad44c085decf8569d.tar.gz
koffice-5254056d0fbc4d05dde43c7ad44c085decf8569d.zip
Fix incorrectly renamed strings
(cherry picked from commit f9f32cc93e35d51abba0fb9f26afc211c60a5ea4)
Diffstat (limited to 'kpresenter/KPrPage.cpp')
-rw-r--r--kpresenter/KPrPage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index fc57515d..43469219 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();
}