summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-30 17:01:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 13:18:57 +0200
commit34f7e618ddd3399d9e7f3998e25545256255d02d (patch)
treefd946f8f2ab8386db89f531d49fae1718a21e943 /sd/source/ui/func
parentc881756fcfdc1fa63ff534bf4538d551b2139515 (diff)
untranslated strings are just strings
removes starmaths InsertCommand in favour of InsertCommandText Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6 Reviewed-on: https://gerrit.libreoffice.org/37113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuconstr.cxx3
-rw-r--r--sd/source/ui/func/fuolbull.cxx3
-rw-r--r--sd/source/ui/func/fuprobjs.cxx5
3 files changed, 7 insertions, 4 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e5ec8b91c1be..4366d5a5aa57 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -29,6 +29,7 @@
#include "app.hrc"
#include "glob.hrc"
+#include "strings.hxx"
#include "fudraw.hxx"
#include "View.hxx"
#include "Window.hxx"
@@ -316,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
***********************************************/
OUString aName( pPage->GetLayoutName() );
sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + strlen(SD_LT_SEPARATOR);
- aName = aName.copy(0, n) + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
+ aName = aName.copy(0, n) + STR_LAYOUT_BACKGROUNDOBJECTS;
SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_MASTERPAGE));
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 81c5f6799b6b..c15d2948573b 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -26,6 +26,7 @@
#include <editeng/numitem.hxx>
#include "sdresid.hxx"
#include "glob.hrc"
+#include "strings.hxx"
#include <editeng/editdata.hxx>
#include <svx/svxids.hrc>
@@ -334,7 +335,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
if(bOutliner)
{
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
- OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+ OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 683c7e58cab1..7a87b97976e8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -29,6 +29,7 @@
#include "strings.hrc"
#include "glob.hrc"
#include "prltempl.hrc"
+#include "strings.hxx"
#include "sdresid.hxx"
#include "drawdoc.hxx"
@@ -121,12 +122,12 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
if( bPage )
{
ePO = PO_TITLE;
- aStyleName += SD_RESSTR(STR_LAYOUT_TITLE);
+ aStyleName += STR_LAYOUT_TITLE;
}
else
{
ePO = (PresentationObjects) ( PO_OUTLINE_1 + nDepth - 1 );
- aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE) + " "
+ aStyleName += STR_LAYOUT_OUTLINE " "
+ OUString::number(nDepth);
}