[Libreoffice-commits] core.git: sd/source
Ivan Timofeev
timofeev.i.s at gmail.com
Sat Aug 24 02:19:04 PDT 2013
sd/source/core/drawdoc.cxx | 10 +--
sd/source/core/drawdoc2.cxx | 12 ++--
sd/source/core/drawdoc3.cxx | 12 ++--
sd/source/core/drawdoc4.cxx | 38 +++++++-------
sd/source/core/sdpage.cxx | 46 ++++++++---------
sd/source/core/stlfamily.cxx | 4 -
sd/source/core/stlpool.cxx | 38 +++++++-------
sd/source/filter/html/htmlattr.cxx | 8 +-
sd/source/filter/html/htmlex.cxx | 4 -
sd/source/filter/html/pubdlg.cxx | 4 -
sd/source/filter/ppt/pptin.cxx | 10 +--
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/dlg/tpaction.cxx | 22 ++++----
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/dlg/unchss.cxx | 24 ++++----
sd/source/ui/framework/module/SlideSorterModule.cxx | 2
sd/source/ui/framework/module/ViewTabBarModule.cxx | 8 +-
sd/source/ui/func/fubullet.cxx | 4 -
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fucopy.cxx | 4 -
sd/source/ui/func/fudraw.cxx | 24 ++++----
sd/source/ui/func/fuexpand.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 14 ++---
sd/source/ui/func/fumorph.cxx | 2
sd/source/ui/func/fusnapln.cxx | 4 -
sd/source/ui/func/fusumry.cxx | 2
sd/source/ui/func/futempl.cxx | 16 ++---
sd/source/ui/func/futhes.cxx | 4 -
sd/source/ui/func/futransf.cxx | 2
sd/source/ui/func/fuvect.cxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 4 -
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 4 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 6 +-
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 2
sd/source/ui/toolpanel/LayoutMenu.cxx | 4 -
sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 22 ++++----
sd/source/ui/unoidl/unomodel.cxx | 10 +--
sd/source/ui/unoidl/unopage.cxx | 14 ++---
42 files changed, 201 insertions(+), 201 deletions(-)
New commits:
commit 30881c7663bd24fbad67e12f15216daa0aea24d7
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sat Aug 24 13:15:47 2013 +0400
String(SdResId(foo)) -> SD_RESSTR(foo)
Change-Id: Ifc683c67ef3a1b228e28faf645a44ca911b6ad0f
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 54f20ba..60fa917 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -346,11 +346,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
String aControlLayerName( SdResId(STR_LAYER_CONTROLS) );
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- rLayerAdmin.NewLayer( String(SdResId(STR_LAYER_LAYOUT)) );
- rLayerAdmin.NewLayer( String(SdResId(STR_LAYER_BCKGRND)) );
- rLayerAdmin.NewLayer( String(SdResId(STR_LAYER_BCKGRNDOBJ)) );
+ rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_LAYOUT) );
+ rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRND) );
+ rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
rLayerAdmin.NewLayer( aControlLayerName );
- rLayerAdmin.NewLayer( String(SdResId(STR_LAYER_MEASURELINES)) );
+ rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_MEASURELINES) );
rLayerAdmin.SetControlLayerName(aControlLayerName);
}
@@ -595,7 +595,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_GRAPHICS)));
// #i119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
- SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(String( SdResId(STR_POOLSHEET_OBJNOLINENOFILL)), SD_STYLE_FAMILY_GRAPHICS)));
+ SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL), SD_STYLE_FAMILY_GRAPHICS)));
// Initialize DrawOutliner and DocumentOutliner, but don't initialize the
// global outliner, as it is not document specific like StyleSheetPool and
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 73ae277..a2cc98b 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -494,7 +494,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
pHandoutPage->SetPageKind(PK_HANDOUT);
- pHandoutPage->SetName( String (SdResId(STR_HANDOUT) ) );
+ pHandoutPage->SetName( SD_RESSTR(STR_HANDOUT) );
InsertPage(pHandoutPage, 0);
// Insert master page and register this with the handout page
@@ -698,7 +698,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(String(SdResId(STR_UNDO_MOVEPAGES)));
+ BegUndo(SD_RESSTR(STR_UNDO_MOVEPAGES));
// List of selected pages
std::vector<SdPage*> aPageList;
@@ -1281,8 +1281,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
// Get background flags
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
return DuplicatePage (
@@ -1435,8 +1435,8 @@ void SdDrawDocument::SetupNewPage (
if (pPreviousPage != NULL)
{
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers();
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 3881a9f..d993bf3 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -226,7 +226,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
if (!bOK)
{
- ErrorBox aErrorBox( NULL, (WinBits)WB_OK, String(SdResId(STR_READ_DATA_ERROR)));
+ ErrorBox aErrorBox( NULL, (WinBits)WB_OK, SD_RESSTR(STR_READ_DATA_ERROR));
aErrorBox.Execute();
CloseBookmarkDoc();
@@ -459,7 +459,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if( mpDocSh )
{
pUndoMgr = mpDocSh->GetUndoManager();
- pUndoMgr->EnterListAction(String(SdResId(STR_UNDO_INSERTPAGES)), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), String());
}
//
@@ -513,7 +513,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(String(SdResId(STR_UNDO_INSERTPAGES)));
+ BegUndo(SD_RESSTR(STR_UNDO_INSERTPAGES));
if (rBookmarkList.empty())
{
@@ -1366,7 +1366,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if( bUndo )
{
- pUndoMgr->EnterListAction(String(SdResId(STR_UNDO_SET_PRESLAYOUT)), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
}
SdPage* pSelectedPage = GetSdPage(nSdPageNum, PK_STANDARD);
@@ -1467,7 +1467,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
String aTemp(aTargetNewLayoutName);
aTemp.AppendAscii(RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
- aTemp.Append(String(SdResId(STR_LAYOUT_OUTLINE)));
+ aTemp.Append(SD_RESSTR(STR_LAYOUT_OUTLINE));
pMaster->SetName(aTargetNewLayoutName);
pMaster->SetLayoutName(aTemp);
@@ -1746,7 +1746,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
OUString aName(createNewMasterPageLayoutName(*this));
String aPageLayoutName(aName);
aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aPageLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
// Generate new stylesheets
static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->CreateLayoutStyleSheets(aName);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 6954913..0951f61 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -124,7 +124,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SdStyleSheetPool* pSSPool = (SdStyleSheetPool*)GetStyleSheetPool();
SfxStyleSheetBase* pSheet = NULL;
String aHelpFile;
- String aStdName = String(SdResId(STR_STANDARD_STYLESHEET_NAME));
+ String aStdName = SD_RESSTR(STR_STANDARD_STYLESHEET_NAME);
// Default style
@@ -250,7 +250,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet* pISet = NULL;
// Object with arrowhead
- aName = String(SdResId(STR_POOLSHEET_OBJWITHARROW));
+ aName = SD_RESSTR(STR_POOLSHEET_OBJWITHARROW);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
@@ -272,7 +272,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStartCenterItem(sal_True));
// Object with Shadow
- aName = String(SdResId(STR_POOLSHEET_OBJWITHSHADOW));
+ aName = SD_RESSTR(STR_POOLSHEET_OBJWITHSHADOW);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
@@ -284,7 +284,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SdrShadowYDistItem(200));
// Object without fillung
- aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
+ aName = SD_RESSTR(STR_POOLSHEET_OBJWITHOUTFILL);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
@@ -295,7 +295,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Object no fill no line
- aName = String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL));
+ aName = SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
@@ -306,7 +306,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Text
- aName = String(SdResId(STR_POOLSHEET_TEXT));
+ aName = SD_RESSTR(STR_POOLSHEET_TEXT);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
@@ -316,7 +316,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(XFILL_NONE));
// Text body
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY));
+ aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
@@ -328,7 +328,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT)); // 16 pt
// Text body, justified
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY));
+ aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_JUSTIFY);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
@@ -340,7 +340,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxAdjustItem(SVX_ADJUST_BLOCK, EE_PARA_JUST ));
// Text body, indented
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_INDENT));
+ aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_INDENT);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
@@ -355,7 +355,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Title
- aName = String(SdResId(STR_POOLSHEET_TITLE));
+ aName = SD_RESSTR(STR_POOLSHEET_TITLE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
@@ -417,7 +417,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Headline
- aName = String(SdResId(STR_POOLSHEET_HEADLINE));
+ aName = SD_RESSTR(STR_POOLSHEET_HEADLINE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
@@ -467,7 +467,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Paragraph margin below: 2,1 mm
// Measurements
- aName = String(SdResId(STR_POOLSHEET_MEASURE));
+ aName = SD_RESSTR(STR_POOLSHEET_MEASURE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
@@ -486,7 +486,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SdrMeasureShowUnitItem(true));
// Generate presentation templates for default layout.
- String aPrefix = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ String aPrefix = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
pSSPool->CreateLayoutStyleSheets(aPrefix);
}
@@ -1014,23 +1014,23 @@ void SdDrawDocument::RestoreLayerNames()
if (aLayerName.EqualsAscii( "LAYER_LAYOUT" ))
{
- pLayer->SetName(String(SdResId(STR_LAYER_LAYOUT)));
+ pLayer->SetName(SD_RESSTR(STR_LAYER_LAYOUT));
}
else if (aLayerName.EqualsAscii( "LAYER_BCKGRND" ))
{
- pLayer->SetName(String(SdResId(STR_LAYER_BCKGRND)));
+ pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRND));
}
else if (aLayerName.EqualsAscii( "LAYER_BACKGRNDOBJ" ))
{
- pLayer->SetName(String(SdResId(STR_LAYER_BCKGRNDOBJ)));
+ pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
}
else if (aLayerName.EqualsAscii( "LAYER_CONTROLS" ))
{
- pLayer->SetName(String(SdResId(STR_LAYER_CONTROLS)));
+ pLayer->SetName(SD_RESSTR(STR_LAYER_CONTROLS));
}
else if (aLayerName.EqualsAscii( "LAYER_MEASURELINES" ))
{
- pLayer->SetName(String(SdResId(STR_LAYER_MEASURELINES)));
+ pLayer->SetName(SD_RESSTR(STR_LAYER_MEASURELINES));
}
}
}
@@ -1111,7 +1111,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
// their master pages.
String aPageLayoutName(rNewName);
aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aPageLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
// Inform all text objects on pages that use the renamed layout and set the
// new name.
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index b714db9..180bf6b 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -494,7 +494,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
// background objects of the master page
pSdrObj->SetLayer( rLayerAdmin.
- GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False) );
+ GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False) );
}
// Subscribe object at the style sheet
@@ -572,7 +572,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
aName.Erase(nPos);
}
- aName += String(SdResId(STR_LAYOUT_BACKGROUND));
+ aName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool();
SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
@@ -601,22 +601,22 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
break;
case PRESOBJ_TITLE:
- aName += String(SdResId(STR_LAYOUT_TITLE));
+ aName += SD_RESSTR(STR_LAYOUT_TITLE);
break;
case PRESOBJ_NOTES:
- aName += String(SdResId(STR_LAYOUT_NOTES));
+ aName += SD_RESSTR(STR_LAYOUT_NOTES);
break;
case PRESOBJ_TEXT:
- aName += String(SdResId(STR_LAYOUT_SUBTITLE));
+ aName += SD_RESSTR(STR_LAYOUT_SUBTITLE);
break;
case PRESOBJ_HEADER:
case PRESOBJ_FOOTER:
case PRESOBJ_DATETIME:
case PRESOBJ_SLIDENUMBER:
- aName += String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aName += SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
break;
default:
@@ -658,7 +658,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" );
return 0;
}
- aStyleName.Append( String( SdResId( nNameId ) ) );
+ aStyleName.Append( SD_RESSTR( nNameId ) );
if( nNameId == STR_LAYOUT_OUTLINE )
{
aStyleName.Append( sal_Unicode( ' ' ));
@@ -2512,7 +2512,7 @@ const String& SdPage::GetName() const
// default name for handout pages
sal_uInt16 nNum = (GetPageNum() + 1) / 2;
- aCreatedPageName = String(SdResId(STR_PAGE));
+ aCreatedPageName = SD_RESSTR(STR_PAGE);
aCreatedPageName += sal_Unicode( ' ' );
if( GetModel()->GetPageNumType() == SVX_NUMBER_NONE )
{
@@ -2531,7 +2531,7 @@ const String& SdPage::GetName() const
/******************************************************************
* default name for note pages
******************************************************************/
- aCreatedPageName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aCreatedPageName = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
}
}
else
@@ -2542,7 +2542,7 @@ const String& SdPage::GetName() const
if (mePageKind == PK_NOTES)
{
aCreatedPageName += sal_Unicode( ' ' );
- aCreatedPageName += String(SdResId(STR_NOTES));
+ aCreatedPageName += SD_RESSTR(STR_NOTES);
}
else if (mePageKind == PK_HANDOUT && mbMaster)
{
@@ -2581,63 +2581,63 @@ String SdPage::GetPresObjText(PresObjKind eObjKind) const
{
if (mePageKind != PK_NOTES)
{
- aString = String ( SdResId( STR_PRESOBJ_MPTITLE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_MPTITLE );
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTITLE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTITLE );
}
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_TITLE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_TITLE );
}
}
else if (eObjKind == PRESOBJ_OUTLINE)
{
if (mbMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPOUTLINE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_MPOUTLINE );
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_OUTLINE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_OUTLINE );
}
}
else if (eObjKind == PRESOBJ_NOTES)
{
if (mbMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTEXT ) );
+ aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTEXT );
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_NOTESTEXT ) );
+ aString = SD_RESSTR( STR_PRESOBJ_NOTESTEXT );
}
}
else if (eObjKind == PRESOBJ_TEXT)
{
- aString = String ( SdResId( STR_PRESOBJ_TEXT ) );
+ aString = SD_RESSTR( STR_PRESOBJ_TEXT );
}
else if (eObjKind == PRESOBJ_GRAPHIC)
{
- aString = String ( SdResId( STR_PRESOBJ_GRAPHIC ) );
+ aString = SD_RESSTR( STR_PRESOBJ_GRAPHIC );
}
else if (eObjKind == PRESOBJ_OBJECT)
{
- aString = String ( SdResId( STR_PRESOBJ_OBJECT ) );
+ aString = SD_RESSTR( STR_PRESOBJ_OBJECT );
}
else if (eObjKind == PRESOBJ_CHART)
{
- aString = String ( SdResId( STR_PRESOBJ_CHART ) );
+ aString = SD_RESSTR( STR_PRESOBJ_CHART );
}
else if (eObjKind == PRESOBJ_ORGCHART)
{
- aString = String ( SdResId( STR_PRESOBJ_ORGCHART ) );
+ aString = SD_RESSTR( STR_PRESOBJ_ORGCHART );
}
else if (eObjKind == PRESOBJ_CALC)
{
- aString = String ( SdResId( STR_PRESOBJ_TABLE ) );
+ aString = SD_RESSTR( STR_PRESOBJ_TABLE );
}
return(aString);
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index d529309..ecc4278 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -542,8 +542,8 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
switch( mnFamily )
{
case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break;
- case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break;
- default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break;
+ case SD_STYLE_FAMILY_CELL: sDisplayName = SD_RESSTR(STR_CELL_STYLE_FAMILY); break;
+ default: sDisplayName = SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY); break;
}
return Any( sDisplayName );
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 228eb25..e84d081 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -124,7 +124,7 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
{
String aName(rLayoutName);
aName.AppendAscii( SD_LT_SEPARATOR );
- aName += String(SdResId(STR_LAYOUT_TITLE));
+ aName += SD_RESSTR(STR_LAYOUT_TITLE);
SfxStyleSheetBase* pResult = Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
return pResult;
}
@@ -140,7 +140,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName, std::v
{
String aName(rLayoutName);
aName.AppendAscii( SD_LT_SEPARATOR );
- aName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aName += SD_RESSTR(STR_LAYOUT_OUTLINE);
for (sal_uInt16 nSheet = 1; nSheet < 10; nSheet++)
{
@@ -326,7 +326,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/**************************************************************************
* Title
**************************************************************************/
- aName = String(SdResId(STR_LAYOUT_TITLE));
+ aName = SD_RESSTR(STR_LAYOUT_TITLE);
aName.Insert(aPrefix, 0);
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
@@ -371,7 +371,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/**************************************************************************
* Subtitle
**************************************************************************/
- aName = String(SdResId(STR_LAYOUT_SUBTITLE));
+ aName = SD_RESSTR(STR_LAYOUT_SUBTITLE);
aName.Insert(aPrefix, 0);
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
@@ -419,7 +419,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/**************************************************************************
* Notes
**************************************************************************/
- aName = String(SdResId(STR_LAYOUT_NOTES));
+ aName = SD_RESSTR(STR_LAYOUT_NOTES);
aName.Insert(aPrefix, 0);
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
@@ -463,7 +463,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/**************************************************************************
* Background objects
**************************************************************************/
- aName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aName = SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
aName.Insert(aPrefix, 0);
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
@@ -486,7 +486,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/**************************************************************************
* Background
**************************************************************************/
- aName = String(SdResId(STR_LAYOUT_BACKGROUND));
+ aName = SD_RESSTR(STR_LAYOUT_BACKGROUND);
aName.Insert(aPrefix, 0);
if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
@@ -730,23 +730,23 @@ void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::ve
aNameList.push_back(aStr);
}
- aStr = String(SdResId(STR_LAYOUT_TITLE));
+ aStr = SD_RESSTR(STR_LAYOUT_TITLE);
aStr.Insert(aPrefix, 0);
aNameList.push_back(aStr);
- aStr = String(SdResId(STR_LAYOUT_SUBTITLE));
+ aStr = SD_RESSTR(STR_LAYOUT_SUBTITLE);
aStr.Insert(aPrefix, 0);
aNameList.push_back(aStr);
- aStr = String(SdResId(STR_LAYOUT_NOTES));
+ aStr = SD_RESSTR(STR_LAYOUT_NOTES);
aStr.Insert(aPrefix, 0);
aNameList.push_back(aStr);
- aStr = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aStr = SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
aStr.Insert(aPrefix, 0);
aNameList.push_back(aStr);
- aStr = String(SdResId(STR_LAYOUT_BACKGROUND));
+ aStr = SD_RESSTR(STR_LAYOUT_BACKGROUND);
aStr.Insert(aPrefix, 0);
aNameList.push_back(aStr);
}
@@ -788,7 +788,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
sal_uInt16 nUsedMask = SFXSTYLEBIT_USED;
- aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -797,7 +797,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
- aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -806,7 +806,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
- aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -815,7 +815,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
- aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -824,7 +824,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
- aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -835,7 +835,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
pParent = NULL;
SetSearchMask(SD_STYLE_FAMILY_PSEUDO);
- aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_OUTLINE);
for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
String aLevelName(aName);
@@ -933,7 +933,7 @@ void SdStyleSheetPool::UpdateStdNames()
{
if( nNameId )
{
- aNewName = String( SdResId( nNameId ) );
+ aNewName = SD_RESSTR( nNameId );
if( nNameId == STR_PSEUDOSHEET_OUTLINE )
{
aNewName.Append( sal_Unicode( ' ' ));
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 21ca43a..d3acedf 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -53,22 +53,22 @@ void SdHtmlAttrPreview::Paint( const Rectangle& rRect )
aTextRect.Bottom() = nHeight + aTextRect.Top();
SetTextColor(m_aTextColor);
- DrawText( aTextRect, String(SdResId(STR_HTMLATTR_TEXT)),
+ DrawText( aTextRect, SD_RESSTR(STR_HTMLATTR_TEXT),
TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER );
aTextRect.Move(0,nHeight);
SetTextColor(m_aLinkColor);
- DrawText( aTextRect, String(SdResId(STR_HTMLATTR_LINK)),
+ DrawText( aTextRect, SD_RESSTR(STR_HTMLATTR_LINK),
TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER );
aTextRect.Move(0,nHeight);
SetTextColor(m_aALinkColor);
- DrawText( aTextRect, String(SdResId(STR_HTMLATTR_ALINK)),
+ DrawText( aTextRect, SD_RESSTR(STR_HTMLATTR_ALINK),
TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER );
aTextRect.Move(0,nHeight);
SetTextColor(m_aVLinkColor);
- DrawText( aTextRect, String(SdResId(STR_HTMLATTR_VLINK)),
+ DrawText( aTextRect, SD_RESSTR(STR_HTMLATTR_VLINK),
TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER );
}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 1c3bf81..8ca3878 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2528,11 +2528,11 @@ String HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const
String aStrNavText;
if( bIsText )
{
- aStrNavText = String( SdResId(STR_HTMLEXP_SETGRAPHIC) );
+ aStrNavText = SD_RESSTR(STR_HTMLEXP_SETGRAPHIC);
}
else
{
- aStrNavText = String( SdResId(STR_HTMLEXP_SETTEXT) );
+ aStrNavText = SD_RESSTR(STR_HTMLEXP_SETTEXT);
}
if(!bIsText && mnButtonThema != -1)
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 9dc23d0..b6a8050 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -412,7 +412,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
String aText( OUString("index") );
- aText += String(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION));
+ aText += SD_RESSTR(STR_HTMLEXP_DEFAULT_EXTENSION);
pPage2_Index->SetText(aText);
pPage2_CGI->SetText( OUString( "/cgi-bin/" ) );
@@ -1145,7 +1145,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
if (iter != m_aDesignList.end())
{
ErrorBox aErrorBox(this, WB_YES_NO,
- String(SdResId(STR_PUBDLG_SAMENAME)));
+ SD_RESSTR(STR_PUBDLG_SAMENAME));
bRetry = aErrorBox.Execute() == RET_NO;
if(!bRetry)
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5561078..0da1ee5 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -249,8 +249,8 @@ sal_Bool ImplSdPPTImport::Import()
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False );
- mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False );
+ mnBackgroundLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), sal_False );
+ mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), sal_False );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
if ( pDocShell )
@@ -539,7 +539,7 @@ sal_Bool ImplSdPPTImport::Import()
///////////////////////////////////////////////////////////
// create master pages:
///////////////////////////////////////////////////////////
- SfxProgress* pStbMgr = new SfxProgress( pDocShell, String( SdResId( STR_POWERPOINT_IMPORT ) ),
+ SfxProgress* pStbMgr = new SfxProgress( pDocShell, SD_RESSTR( STR_POWERPOINT_IMPORT ),
pMasterPages->size() + pSlidePages->size() + pNotePages->size() );
sal_uInt32 nImportedPages = 0;
@@ -606,7 +606,7 @@ sal_Bool ImplSdPPTImport::Import()
{
if ( ePgKind == PK_STANDARD )
{ // standard page: create new presentation layout
- aLayoutName = String( SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME ) );
+ aLayoutName = SD_RESSTR( STR_LAYOUT_DEFAULT_TITLE_NAME );
aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
}
@@ -615,7 +615,7 @@ sal_Bool ImplSdPPTImport::Import()
}
pPage->SetName( aLayoutName );
aLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aLayoutName += String( SdResId( STR_LAYOUT_OUTLINE ) );
+ aLayoutName += SD_RESSTR( STR_LAYOUT_OUTLINE );
pPage->SetLayoutName( aLayoutName );
/////////////////////
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 8a958bc..bcb71e3 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -179,7 +179,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl)
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
{
SfxNewFileDialog* pDlg = new SfxNewFileDialog(this, SFXWB_PREVIEW);
- pDlg->SetText(String(SdResId(STR_LOAD_PRESENTATION_LAYOUT)));
+ pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
if(!IsReallyVisible())
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index af3c6d2..965a452 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -763,7 +763,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
if ( !mpBookmarkDoc )
{
- ErrorBox aErrorBox( this, WB_OK, String( SdResId( STR_READ_DATA_ERROR ) ) );
+ ErrorBox aErrorBox( this, WB_OK, SD_RESSTR( STR_READ_DATA_ERROR ) );
aErrorBox.Execute();
mpMedium = 0; //On failure the SfxMedium is invalid
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e27b406..53e5b1a 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -123,7 +123,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
mpDoc ( NULL ),
bTreeUpdated ( sal_False )
{
- aEdtSound.SetAccessibleName(String(SdResId(STR_PATHNAME)));
+ aEdtSound.SetAccessibleName(SD_RESSTR(STR_PATHNAME));
aBtnSeek.SetAccessibleRelationMemberOf( &aFlSeparator );
FreeResource();
@@ -214,7 +214,7 @@ void SdTPAction::Construct()
bOLEAction = sal_True;
aVerbVector.push_back( 0 );
- aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( String( SdResId( STR_EDIT_OBJ ) ) ) );
+ aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SD_RESSTR( STR_EDIT_OBJ ) ) );
}
else if( pOleObj )
{
@@ -264,7 +264,7 @@ void SdTPAction::Construct()
for (size_t nAction = 0, n = maCurrentActions.size(); nAction < n; nAction++)
{
sal_uInt16 nRId = GetClickActionSdResId( maCurrentActions[ nAction ] );
- aLbAction.InsertEntry( String( SdResId( nRId ) ) );
+ aLbAction.InsertEntry( SD_RESSTR( nRId ) );
}
}
@@ -604,7 +604,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
aEdtSound.Enable();
aBtnSearch.Show();
aBtnSearch.Enable();
- aFlSeparator.SetText( String( SdResId( STR_EFFECTDLG_SOUND ) ) );
+ aFlSeparator.SetText( SD_RESSTR( STR_EFFECTDLG_SOUND ) );
break;
case presentation::ClickAction_PROGRAM:
@@ -615,12 +615,12 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
if( eCA == presentation::ClickAction_MACRO )
{
aEdtMacro.Show();
- aFlSeparator.SetText( String( SdResId( STR_EFFECTDLG_MACRO ) ) );
+ aFlSeparator.SetText( SD_RESSTR( STR_EFFECTDLG_MACRO ) );
}
else
{
aEdtProgram.Show();
- aFlSeparator.SetText( String( SdResId( STR_EFFECTDLG_PROGRAM ) ) );
+ aFlSeparator.SetText( SD_RESSTR( STR_EFFECTDLG_PROGRAM ) );
}
break;
@@ -633,8 +633,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
aBtnSearch.Show();
aBtnSearch.Enable();
- aFtTree.SetText( String( SdResId( STR_EFFECTDLG_JUMP ) ) );
- aFlSeparator.SetText( String( SdResId( STR_EFFECTDLG_DOCUMENT ) ) );
+ aFtTree.SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
+ aFlSeparator.SetText( SD_RESSTR( STR_EFFECTDLG_DOCUMENT ) );
CheckFileHdl( NULL );
break;
@@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
aFtTree.Show();
aLbOLEAction.Show();
- aFtTree.SetText( String( SdResId( STR_EFFECTDLG_ACTION ) ) );
+ aFtTree.SetText( SD_RESSTR( STR_EFFECTDLG_ACTION ) );
break;
case presentation::ClickAction_BOOKMARK:
@@ -656,8 +656,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
aEdtBookmark.Show();
aBtnSeek.Show();
- aFtTree.SetText( String( SdResId( STR_EFFECTDLG_JUMP ) ) );
- aFlSeparator.SetText( String( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) ) );
+ aFtTree.SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
+ aFlSeparator.SetText( SD_RESSTR( STR_EFFECTDLG_PAGE_OBJECT ) );
break;
default:
break;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 6bc0743..ffa68c5 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -352,7 +352,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
FillItemSet( *pActiveSet );
return( LEAVE_PAGE );
}
- WarningBox aWarnBox( GetParent(), WB_YES_NO, String( SdResId( STR_WARN_SCALE_FAIL ) ) );
+ WarningBox aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) );
short nReturn = aWarnBox.Execute();
if( nReturn == RET_YES )
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 489ab81..9c5c1e1 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -51,7 +51,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
pOldSet = new SfxItemSet((SfxItemPool&)SdrObject::GetGlobalDrawObjectItemPool(),pStyleSheet->GetItemSet().GetRanges());
pTheDoc->MigrateItemSet( &pStyleSheet->GetItemSet(), pOldSet, pTheDoc );
- aComment = String(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
+ aComment = SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT);
String aName(pStyleSheet->GetName());
// delete layout name and separator
@@ -60,25 +60,25 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if( nPos != STRING_NOTFOUND )
aName.Erase(0, nPos + aSep.Len());
- if (aName == String(SdResId(STR_LAYOUT_TITLE)))
+ if (aName == SD_RESSTR(STR_LAYOUT_TITLE))
{
- aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
}
- else if (aName == String(SdResId(STR_LAYOUT_SUBTITLE)))
+ else if (aName == SD_RESSTR(STR_LAYOUT_SUBTITLE))
{
- aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
}
- else if (aName == String(SdResId(STR_LAYOUT_BACKGROUND)))
+ else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUND))
{
- aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
}
- else if (aName == String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS)))
+ else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS))
{
- aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
}
- else if (aName == String(SdResId(STR_LAYOUT_NOTES)))
+ else if (aName == SD_RESSTR(STR_LAYOUT_NOTES))
{
- aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
+ aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
}
else
{
@@ -87,7 +87,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if (nPos != STRING_NOTFOUND)
{
String aNumStr(aName.Copy(aOutlineStr.Len()));
- aName = String(SdResId(STR_LAYOUT_OUTLINE));
+ aName = SD_RESSTR(STR_LAYOUT_OUTLINE);
aName += aNumStr;
}
}
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 412a7c6..bbd6c8d 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -141,7 +141,7 @@ void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aButtonA.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msCenterPaneURL);
- aButtonA.ButtonLabel = String(SdResId(STR_SLIDE_MODE));
+ aButtonA.ButtonLabel = SD_RESSTR(STR_SLIDE_MODE);
TabBarButton aButtonB;
aButtonB.ResourceId = FrameworkHelper::CreateResourceId(
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index e490cdb..0e943e2 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -173,7 +173,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aImpressViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msImpressViewURL,
xAnchor);
- aImpressViewButton.ButtonLabel = String(SdResId(STR_DRAW_MODE));
+ aImpressViewButton.ButtonLabel = SD_RESSTR(STR_DRAW_MODE);
if ( ! xBar->hasTabBarButton(aImpressViewButton))
xBar->addTabBarButtonAfter(aImpressViewButton, aEmptyButton);
@@ -181,7 +181,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aOutlineViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msOutlineViewURL,
xAnchor);
- aOutlineViewButton.ButtonLabel = String(SdResId(STR_OUTLINE_MODE));
+ aOutlineViewButton.ButtonLabel = SD_RESSTR(STR_OUTLINE_MODE);
if ( ! xBar->hasTabBarButton(aOutlineViewButton))
xBar->addTabBarButtonAfter(aOutlineViewButton, aImpressViewButton);
@@ -189,7 +189,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aNotesViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msNotesViewURL,
xAnchor);
- aNotesViewButton.ButtonLabel = String(SdResId(STR_NOTES_MODE));
+ aNotesViewButton.ButtonLabel = SD_RESSTR(STR_NOTES_MODE);
if ( ! xBar->hasTabBarButton(aNotesViewButton))
xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton);
@@ -197,7 +197,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msHandoutViewURL,
xAnchor);
- aHandoutViewButton.ButtonLabel = String(SdResId(STR_HANDOUT_MODE));
+ aHandoutViewButton.ButtonLabel = SD_RESSTR(STR_HANDOUT_MODE);
if ( ! xBar->hasTabBarButton(aHandoutViewButton))
xBar->addTabBarButtonAfter(aHandoutViewButton, aNotesViewButton);
}
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 7795cb8..0293b60 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -128,7 +128,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
// prepare undo
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
- rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)),
+ rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
aEmptyStr );
// insert given text
@@ -258,7 +258,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
aOldSet.Put( pOV->GetAttribs() );
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
- rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)),
+ rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
aEmptyStr );
pOV->InsertText(aChars, sal_True);
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 27e937b..06bc960 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -345,7 +345,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
sal_uInt16 n = aName.Search(aSep);
n = n + aSep.Len();
aName.Erase(n);
- aName.Append( String ( SdResId( STR_LAYOUT_BACKGROUNDOBJECTS ) ) );
+ aName.Append( SD_RESSTR( STR_LAYOUT_BACKGROUNDOBJECTS ) );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index f59cd73..ff433b7 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -67,7 +67,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// Undo
String aString( mpView->GetDescriptionOfMarkedObjects() );
aString.Append( sal_Unicode(' ') );
- aString.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) );
+ aString.Append( SD_RESSTR( STR_UNDO_COPYOBJECTS ) );
mpView->BegUndo( aString );
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -175,7 +175,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
{
String aStr( SdResId( STR_OBJECTS ) );
aStr.Append( sal_Unicode(' ') );
- aStr.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) );
+ aStr.Append( SD_RESSTR( STR_UNDO_COPYOBJECTS ) );
pProgress = new SfxProgress( mpDocSh, aStr, nNumber );
mpDocSh->SetWaitCursor( sal_True );
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index e5bdf29..943ed97 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -383,7 +383,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
if ( mpView && mpView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) )
{
- InfoBox(mpWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute();
+ InfoBox(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute();
}
else
{
@@ -857,35 +857,35 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV
case presentation::ClickAction_PREVPAGE:
{
// jump to the prior page
- aHelpText = String(SdResId(STR_CLICK_ACTION_PREVPAGE));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_PREVPAGE);
}
break;
case presentation::ClickAction_NEXTPAGE:
{
// jump to the next page
- aHelpText = String(SdResId(STR_CLICK_ACTION_NEXTPAGE));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_NEXTPAGE);
}
break;
case presentation::ClickAction_FIRSTPAGE:
{
// jump to the first page
- aHelpText = String(SdResId(STR_CLICK_ACTION_FIRSTPAGE));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_FIRSTPAGE);
}
break;
case presentation::ClickAction_LASTPAGE:
{
// jump to the last page
- aHelpText = String(SdResId(STR_CLICK_ACTION_LASTPAGE));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_LASTPAGE);
}
break;
case presentation::ClickAction_BOOKMARK:
{
// jump to object/page
- aHelpText = String(SdResId(STR_CLICK_ACTION_BOOKMARK));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_BOOKMARK);
aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
@@ -894,7 +894,7 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV
case presentation::ClickAction_DOCUMENT:
{
// jump to document (object/page)
- aHelpText = String(SdResId(STR_CLICK_ACTION_DOCUMENT));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_DOCUMENT);
aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
@@ -903,7 +903,7 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV
case presentation::ClickAction_PROGRAM:
{
// execute program
- aHelpText = String(SdResId(STR_CLICK_ACTION_PROGRAM));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_PROGRAM);
aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
@@ -912,7 +912,7 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV
case presentation::ClickAction_MACRO:
{
// execute program
- aHelpText = String(SdResId(STR_CLICK_ACTION_MACRO));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_MACRO);
aHelpText.AppendAscii( ": " );
if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
@@ -935,21 +935,21 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV
case presentation::ClickAction_SOUND:
{
// play-back sound
- aHelpText = String(SdResId(STR_CLICK_ACTION_SOUND));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_SOUND);
}
break;
case presentation::ClickAction_VERB:
{
// execute OLE-verb
- aHelpText = String(SdResId(STR_CLICK_ACTION_VERB));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_VERB);
}
break;
case presentation::ClickAction_STOPPRESENTATION:
{
// quit presentation
- aHelpText = String(SdResId(STR_CLICK_ACTION_STOPPRESENTATION));
+ aHelpText = SD_RESSTR(STR_CLICK_ACTION_STOPPRESENTATION);
}
break;
default:
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index ce2e0ba..2f839c3 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -108,7 +108,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
const bool bUndo = mpView->IsUndoEnabled();
if( bUndo )
- mpView->BegUndo(String(SdResId(STR_UNDO_EXPAND_PAGE)));
+ mpView->BegUndo(SD_RESSTR(STR_UNDO_EXPAND_PAGE));
// set current structuring-object into outliner
OutlinerParaObject* pParaObj = pActualOutline->GetOutlinerParaObject();
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index e7f882b..a3af98d 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -110,7 +110,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
OUString aOtherCont;
const SfxFilter* pFilter = NULL;
- aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) );
+ aFileDialog.SetTitle( SD_RESSTR(STR_DLG_INSERT_PAGES_FROM_FILE) );
if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
{
@@ -308,7 +308,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
if( !bInserted )
{
- ErrorBox aErrorBox( mpWindow, WB_OK, String( SdResId( STR_READ_DATA_ERROR ) ) );
+ ErrorBox aErrorBox( mpWindow, WB_OK, SD_RESSTR( STR_READ_DATA_ERROR ) );
aErrorBox.Execute();
delete pMedium;
}
@@ -460,7 +460,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
{
ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
- String(SdResId(STR_READ_DATA_ERROR)));
+ SD_RESSTR(STR_READ_DATA_ERROR));
aErrorBox.Execute();
}
else
@@ -509,7 +509,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
const bool bUndo = mpView->IsUndoEnabled();
if( bUndo )
- mpView->BegUndo(String(SdResId(STR_UNDO_INSERT_TEXTFRAME)));
+ mpView->BegUndo(SD_RESSTR(STR_UNDO_INSERT_TEXTFRAME));
pPage->InsertObject(pTO);
/* can be bigger as the maximal allowed size:
@@ -608,7 +608,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
{
ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
- String(SdResId(STR_READ_DATA_ERROR)));
+ SD_RESSTR(STR_READ_DATA_ERROR));
aErrorBox.Execute();
}
else
@@ -628,14 +628,14 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( sal_False );
- SfxProgress* pProgress = new SfxProgress( mpDocSh, String( SdResId(STR_CREATE_PAGES)), nNewPages);
+ SfxProgress* pProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages);
if( pProgress )
pProgress->SetState( 0, 100 );
nNewPages = 0;
pDocliner->GetUndoManager().EnterListAction(
- String(SdResId(STR_UNDO_INSERT_FILE)), String() );
+ SD_RESSTR(STR_UNDO_INSERT_FILE), String() );
sal_Int32 nSourcePos = 0;
SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE );
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 6f43290..f556b8a 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -167,7 +167,7 @@ void FuMorph::DoExecute( SfxRequest& )
String aString(mpView->GetDescriptionOfMarkedObjects());
aString.Append(sal_Unicode(' '));
- aString.Append(String(SdResId(STR_UNDO_MORPHING)));
+ aString.Append(SD_RESSTR(STR_UNDO_MORPHING));
mpView->BegUndo(aString);
ImpInsertPolygons(aPolyPolyList, pDlg->IsAttributeFade(), pObj1, pObj2);
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 6bcb368..67d5420 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -125,12 +125,12 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
if ( rHelpLine.GetKind() == SDRHELPLINE_POINT )
{
- pDlg->SetText(String(SdResId(STR_SNAPDLG_SETPOINT)));
+ pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETPOINT));
pDlg->SetInputFields(sal_True, sal_True);
}
else
{
- pDlg->SetText(String(SdResId(STR_SNAPDLG_SETLINE)));
+ pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETLINE));
if ( rHelpLine.GetKind() == SDRHELPLINE_VERTICAL )
pDlg->SetInputFields(sal_True, sal_False);
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 4009e31..32b5658 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -110,7 +110,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
if( bUndo )
{
- mpView->BegUndo(String(SdResId(STR_UNDO_SUMMARY_PAGE)));
+ mpView->BegUndo(SD_RESSTR(STR_UNDO_SUMMARY_PAGE));
bBegUndo = true;
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 61a223d..866ddbb 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -177,7 +177,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
else
{
- pStyleSheet->SetParent(String(SdResId(STR_STANDARD_STYLESHEET_NAME)));
+ pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
}
}
break;
@@ -193,7 +193,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
p = 0;
}
pStyleSheet = &pSSPool->Make( aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_USERDEF );
- pStyleSheet->SetParent(String(SdResId(STR_STANDARD_STYLESHEET_NAME)));
+ pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
}
break;
@@ -313,35 +313,35 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
String aName(pStyleSheet->GetName());
sal_uInt16 nDlgId = 0;
- if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
+ if (aName == SD_RESSTR(STR_PSEUDOSHEET_TITLE))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_TITLE;
}
- else if (aName == String(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
+ else if (aName == SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_SUBTITLE;
}
else if (aName ==
- String(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
+ SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND;
ePO = PO_BACKGROUND;
}
else if (aName ==
- String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+ SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_BACKGROUNDOBJECTS;
}
else if (aName ==
- String(SdResId(STR_PSEUDOSHEET_NOTES)))
+ SD_RESSTR(STR_PSEUDOSHEET_NOTES))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_NOTES;
}
- else if(aName.Search(String(SdResId(STR_PSEUDOSHEET_OUTLINE))) !=
+ else if(aName.Search(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE)) !=
STRING_NOTFOUND)
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 6fb6afa..2998d2e 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -113,7 +113,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
if (eState == EE_SPELL_NOLANGUAGE)
{
- ErrorBox(mpWindow, WB_OK, String(SdResId(STR_NOLANGUAGE))).Execute();
+ ErrorBox(mpWindow, WB_OK, SD_RESSTR(STR_NOLANGUAGE)).Execute();
}
}
}
@@ -140,7 +140,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
if (eState == EE_SPELL_NOLANGUAGE)
{
- ErrorBox(mpWindow, WB_OK, String(SdResId(STR_NOLANGUAGE))).Execute();
+ ErrorBox(mpWindow, WB_OK, SD_RESSTR(STR_NOLANGUAGE)).Execute();
}
}
}
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 26ce804..9640b6d 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -109,7 +109,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
// Undo
String aString( mpView->GetDescriptionOfMarkedObjects() );
aString.Append( sal_Unicode(' ') );
- aString.Append( String( SdResId( STR_TRANSFORM ) ) );
+ aString.Append( SD_RESSTR( STR_TRANSFORM ) );
mpView->BegUndo( aString );
mpView->SetGeoAttrToMarked( *pArgs );
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index ecf9893..d783fa3 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -76,7 +76,7 @@ void FuVectorize::DoExecute( SfxRequest& )
String aStr( mpView->GetDescriptionOfMarkedObjects() );
aStr.Append( sal_Unicode(' ') );
- aStr.Append( String( SdResId( STR_UNDO_VECTORIZE ) ) );
+ aStr.Append( SD_RESSTR( STR_UNDO_VECTORIZE ) );
mpView->BegUndo( aStr );
pVectObj->SetGraphic( rMtf );
mpView->ReplaceObjectAtView( pObj, *pPageView, pVectObj );
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 4cdbb0e..d4da996 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -329,7 +329,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(String(SdResId(STR_UNDO_SET_PRESLAYOUT)), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == NULL)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index e55f7e1..bf392db 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -570,9 +570,9 @@ SfxRequest LayoutMenu::CreateRequest (
{
SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin());
sal_uInt8 aBackground (rLayerAdmin.GetLayerID(
- String(SdResId(STR_LAYER_BCKGRND)), sal_False));
+ SD_RESSTR(STR_LAYER_BCKGRND), sal_False));
sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(
- String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False));
+ SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False));
ViewShell* pViewShell = mrBase.GetMainViewShell().get();
if (pViewShell == NULL)
break;
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 7d658ea..2190b26 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -121,9 +121,9 @@ public:
if (mpDocument!=NULL && mpDocument->IsUndoEnabled())
{
if (mpMainViewShell && mpMainViewShell->GetShellType() == ViewShell::ST_DRAW)
- mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_PAGES)));
+ mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_PAGES));
else
- mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_SLIDES)));
+ mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_SLIDES));
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 0e8babb..93875a3 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1014,8 +1014,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String
// Undo
SdPage* pUndoPage = pPageToRename;
SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin();
- sal_uInt8 nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False );
- sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False );
+ sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), sal_False );
+ sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), sal_False );
SetOfByte aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers();
// (#67720#)
@@ -1164,7 +1164,7 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
// created pages in aPagesToSelect.
const bool bUndo (aPagesToDuplicate.size()>1 && mrSlideSorter.GetView().IsUndoEnabled());
if (bUndo)
- mrSlideSorter.GetView().BegUndo(String(SdResId(STR_INSERTPAGE)));
+ mrSlideSorter.GetView().BegUndo(SD_RESSTR(STR_INSERTPAGE));
::std::vector<SdPage*> aPagesToSelect;
for(::std::vector<SdPage*>::const_iterator
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 9542055..5f44350 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -81,7 +81,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
}
if (sHelpText.isEmpty())
{
- sHelpText = String(SdResId(STR_PAGE));
+ sHelpText = SD_RESSTR(STR_PAGE);
sHelpText += OUString::number(mpDescriptor->GetPageIndex()+1);
}
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 24bb21c..21d44e7 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -98,7 +98,7 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
}
SetRepeatTarget( mpView );
SetHelpId( SD_IF_SDDRAWTABLEOBJECTBAR );
- SetName( String( SdResId( RID_DRAW_TABLE_TOOLBOX ) ) );
+ SetName( SD_RESSTR( RID_DRAW_TABLE_TOOLBOX ) );
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Table));
}
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 1e34584..557a31f 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -720,9 +720,9 @@ SfxRequest LayoutMenu::CreateRequest (
{
SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin());
sal_uInt8 aBackground (rLayerAdmin.GetLayerID(
- String(SdResId(STR_LAYER_BCKGRND)), sal_False));
+ SD_RESSTR(STR_LAYER_BCKGRND), sal_False));
sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(
- String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False));
+ SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False));
ViewShell* pViewShell = mrBase.GetMainViewShell().get();
if (pViewShell == NULL)
break;
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index 25842f0..5c987b1 100644
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -330,7 +330,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(String(SdResId(STR_UNDO_SET_PRESLAYOUT)), String());
+ pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == NULL)
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index bf523c1..fbf14f5 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -84,23 +84,23 @@ String SdLayer::convertToInternalName( const OUString& rName )
{
if ( rName == sUNO_LayerName_background )
{
- return String( SdResId( STR_LAYER_BCKGRND ) );
+ return SD_RESSTR( STR_LAYER_BCKGRND );
}
else if ( rName == sUNO_LayerName_background_objects )
{
- return String( SdResId( STR_LAYER_BCKGRNDOBJ ) );
+ return SD_RESSTR( STR_LAYER_BCKGRNDOBJ );
}
else if ( rName == sUNO_LayerName_layout )
{
- return String( SdResId( STR_LAYER_LAYOUT ) );
+ return SD_RESSTR( STR_LAYER_LAYOUT );
}
else if ( rName == sUNO_LayerName_controls )
{
- return String( SdResId( STR_LAYER_CONTROLS ) );
+ return SD_RESSTR( STR_LAYER_CONTROLS );
}
else if ( rName == sUNO_LayerName_measurelines )
{
- return String( SdResId( STR_LAYER_MEASURELINES ) );
+ return SD_RESSTR( STR_LAYER_MEASURELINES );
}
else
{
@@ -110,23 +110,23 @@ String SdLayer::convertToInternalName( const OUString& rName )
OUString SdLayer::convertToExternalName( const String& rName )
{
- if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) )
+ if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
{
return OUString( sUNO_LayerName_background );
}
- else if( rName == String( SdResId( STR_LAYER_BCKGRNDOBJ ) ) )
+ else if( rName == SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) )
{
return OUString( sUNO_LayerName_background_objects );
}
- else if( rName == String( SdResId( STR_LAYER_LAYOUT ) ) )
+ else if( rName == SD_RESSTR( STR_LAYER_LAYOUT ) )
{
return OUString( sUNO_LayerName_layout );
}
- else if( rName == String( SdResId( STR_LAYER_CONTROLS ) ) )
+ else if( rName == SD_RESSTR( STR_LAYER_CONTROLS ) )
{
return OUString( sUNO_LayerName_controls );
}
- else if( rName == String( SdResId( STR_LAYER_MEASURELINES ) ) )
+ else if( rName == SD_RESSTR( STR_LAYER_MEASURELINES ) )
{
return OUString( sUNO_LayerName_measurelines );
}
@@ -530,7 +530,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
// Test for existing names
while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
{
- aLayerName = String(SdResId(STR_LAYER));
+ aLayerName = SD_RESSTR(STR_LAYER);
aLayerName += OUString::number(nLayer);
++nLayer;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 58a819f..6a55af3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -452,8 +452,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
{
sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SdPage* pStandardPage = NULL;
@@ -514,8 +514,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True );
}
- aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
@@ -2706,7 +2706,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
String aLayoutName( aPrefix );
aLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
// create styles
((SdStyleSheetPool*)mpDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 6a65ba0..29356b6 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -755,7 +755,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -775,7 +775,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -1174,7 +1174,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False));
+ aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False));
}
else
{
@@ -1193,7 +1193,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False));
+ aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False));
}
else
{
@@ -2210,7 +2210,7 @@ String getUiNameFromPageApiNameImpl( const OUString& rApiName )
if( nPageNumber != -1)
{
OUStringBuffer sBuffer;
- sBuffer.append( String(SdResId(STR_PAGE)) );
+ sBuffer.append( SD_RESSTR(STR_PAGE) );
sBuffer.append( sal_Unicode( ' ' ) );
sBuffer.append( aNumber );
return sBuffer.makeStringAndClear();
@@ -2934,7 +2934,7 @@ void SdMasterPage::setBackground( const Any& rValue )
{
String aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() );
aLayoutName.Erase(aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
- aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
+ aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
if( pStyleSheet )
@@ -2978,7 +2978,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
{
String aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() );
aLayoutName.Erase( aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
- aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
+ aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
if( pStyleSheet )
More information about the Libreoffice-commits
mailing list