summaryrefslogtreecommitdiffstats
path: root/binfilter/bf_sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'binfilter/bf_sd/source')
-rw-r--r--binfilter/bf_sd/source/core/sd_drawdoc.cxx2
-rw-r--r--binfilter/bf_sd/source/core/sd_drawdoc2.cxx2
-rw-r--r--binfilter/bf_sd/source/core/sd_drawdoc4.cxx36
-rw-r--r--binfilter/bf_sd/source/core/sd_sdpage.cxx62
-rw-r--r--binfilter/bf_sd/source/core/sd_stlpool.cxx96
-rw-r--r--binfilter/bf_sd/source/core/sd_stlsheet.cxx24
-rw-r--r--binfilter/bf_sd/source/filter/sd_sdfilter.cxx2
-rw-r--r--binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx20
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx4
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx2
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx4
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx4
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx8
-rw-r--r--binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx4
14 files changed, 135 insertions, 135 deletions
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index f41f1bcdd..509432c4d 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -882,7 +882,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
// Standardvorlage an der Drawing Engine setzen
- String aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
+ String aName( SdResId(STR_STANDARD_STYLESHEET_NAME).toString() );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pStyleSheetPool->
Find(aName, SFX_STYLE_FAMILY_PARA);
SetDefaultStyleSheet(pSheet);
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
index 90047291f..8a7aad05f 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
@@ -254,7 +254,7 @@ void SdDrawDocument::CreateFirstPages()
pHandoutPage->SetBorder(2000, 2000, 2000, 2000);
pHandoutPage->SetPageKind(PK_HANDOUT);
- pHandoutPage->SetName( String (SdResId(STR_HANDOUT) ) );
+ pHandoutPage->SetName( SdResId(STR_HANDOUT).toString() );
InsertPage(pHandoutPage, 0);
SdPage* pHandoutMPage = (SdPage*) AllocPage((bMasterPage=TRUE));
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
index c91ab144b..bf5f47bae 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
@@ -101,7 +101,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SdStyleSheetPool* pLclStyleSheetPool = (SdStyleSheetPool*)GetStyleSheetPool();
SfxStyleSheetBase* pSheet = NULL;
String aHelpFile;
- String aStdName = String(SdResId(STR_STANDARD_STYLESHEET_NAME));
+ String aStdName = SdResId(STR_STANDARD_STYLESHEET_NAME).toString();
// ---- Standardvorlage -----------------------------------------------
@@ -223,7 +223,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt mit Pfeilspitze ----------------------------------------
- aName = String(SdResId(STR_POOLSHEET_OBJWITHARROW));
+ aName = SdResId(STR_POOLSHEET_OBJWITHARROW).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
@@ -238,7 +238,7 @@ void SdDrawDocument::CreateLayoutTemplates()
aArrow[1]=Point(0,30); // \ /
aArrow[2]=Point(20,30); // \ /
aArrow[3]=Point(10,0); // \/1,0
- pISet->Put(XLineStartItem(ResId::toString(SdResId(STR_POOLSHEET_ARROW)),aArrow));
+ pISet->Put(XLineStartItem(SdResId(STR_POOLSHEET_ARROW).toString(),aArrow));
pISet->Put(XLineStartWidthItem(700));
pISet->Put(XLineEndWidthItem(300));
@@ -246,7 +246,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt mit Schatten -------------------------------------------
- aName = ResId::toString(SdResId(STR_POOLSHEET_OBJWITHSHADOW));
+ aName = SdResId(STR_POOLSHEET_OBJWITHSHADOW).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
@@ -259,7 +259,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt ohne Fllung -------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
+ aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
@@ -269,7 +269,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Text ----------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXT));
+ aName = SdResId(STR_POOLSHEET_TEXT).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
@@ -280,7 +280,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper ----------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
@@ -293,7 +293,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper mit Blocksatz --------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
@@ -306,7 +306,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textkoerper mit Einzug -----------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TEXTBODY_INDENT));
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_INDENT).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
@@ -326,7 +326,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel ---------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE));
+ aName = SdResId(STR_POOLSHEET_TITLE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
@@ -339,7 +339,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel1 --------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE1));
+ aName = SdResId(STR_POOLSHEET_TITLE1).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
@@ -360,7 +360,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel2 --------------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_TITLE2));
+ aName = SdResId(STR_POOLSHEET_TITLE2).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
@@ -393,7 +393,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift ---------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE));
+ aName = SdResId(STR_POOLSHEET_HEADLINE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
@@ -409,7 +409,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift1 --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE1));
+ aName = SdResId(STR_POOLSHEET_HEADLINE1).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
@@ -427,7 +427,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift2 --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_HEADLINE2));
+ aName = SdResId(STR_POOLSHEET_HEADLINE2).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
@@ -446,7 +446,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Bemassung --------------------------------------------------
- aName = String(SdResId(STR_POOLSHEET_MEASURE));
+ aName = SdResId(STR_POOLSHEET_MEASURE).toString();
pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
@@ -462,7 +462,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStyleItem(XLINE_SOLID));
// Praesentationsvorlagen fuer das Standardlayout erzeugen
- String aPrefix = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ String aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
pLclStyleSheetPool->CreateLayoutStyleSheets(aPrefix);
}
@@ -603,7 +603,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
// sowie ihrer Masterpages setzen
String aPageLayoutName(rNewName);
aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aPageLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
// an allen Seiten, die das jetzt umbeannte Layout benutzen, die
// Textobjekte von der Aenderung unterrichten und Layoutnamen setzen
diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx
index 33ced3536..f1c757a85 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx
@@ -83,9 +83,9 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pInBasic, BOOL bMasterPage) :
nPaperBin(PAPERBIN_PRINTER_SETTINGS),
mpItems(NULL)
{
- aLayoutName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aLayoutName = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
eCharSet = osl_getThreadTextEncoding();
@@ -366,20 +366,20 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind)
break;
case PRESOBJ_TITLE:
- aName += String(SdResId(STR_LAYOUT_TITLE));
+ aName += SdResId(STR_LAYOUT_TITLE).toString();
break;
case PRESOBJ_BACKGROUND:
- aName += String(SdResId(STR_LAYOUT_BACKGROUND));
+ aName += SdResId(STR_LAYOUT_BACKGROUND).toString();
break;
case PRESOBJ_NOTES:
- aName += String(SdResId(STR_LAYOUT_NOTES));
+ aName += SdResId(STR_LAYOUT_NOTES).toString();
break;
case PRESOBJ_TEXT:
{
- aName += String(SdResId(STR_LAYOUT_SUBTITLE));
+ aName += SdResId(STR_LAYOUT_SUBTITLE).toString();
}
break;
@@ -1891,28 +1891,28 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER2 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER3 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER4 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER5 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER6 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER7 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER8 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER8 ).toString();
aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t\t\t" ));
- aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER9 ) );
+ aString += SdResId( STR_PRESOBJ_MPOUTLLAYER9 ).toString();
}
}
else if (eObjKind == PRESOBJ_TITLE)
@@ -1975,13 +1975,13 @@ const String& SdPage::GetName()
!bMaster)
{
USHORT nNum = (GetPageNum() + 1) / 2;
- aCreatedPageName = String(SdResId(STR_PAGE));
+ aCreatedPageName = SdResId(STR_PAGE).toString();
aCreatedPageName += sal_Unicode( ' ' );
aCreatedPageName += ((SdDrawDocument*) GetModel())->CreatePageNumValue(nNum);
}
else
{
- aCreatedPageName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ aCreatedPageName = SdResId(STR_LAYOUT_DEFAULT_NAME).toString();
}
}
else
@@ -1992,12 +1992,12 @@ const String& SdPage::GetName()
if (ePageKind == PK_NOTES)
{
aCreatedPageName += sal_Unicode( ' ' );
- aCreatedPageName += String(SdResId(STR_NOTES));
+ aCreatedPageName += SdResId(STR_NOTES).toString();
}
else if (ePageKind == PK_HANDOUT && bMaster)
{
aCreatedPageName += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ));
- aCreatedPageName += String(SdResId(STR_HANDOUT));
+ aCreatedPageName += SdResId(STR_HANDOUT).toString();
aCreatedPageName += sal_Unicode( ')' );
}
@@ -2051,63 +2051,63 @@ String SdPage::GetPresObjText(PresObjKind eObjKind)
{
if (ePageKind != PK_NOTES)
{
- aString = String ( SdResId( STR_PRESOBJ_MPTITLE ) );
+ aString = SdResId( STR_PRESOBJ_MPTITLE ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTITLE ) );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTITLE ).toString();
}
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_TITLE ) );
+ aString = SdResId( STR_PRESOBJ_TITLE ).toString();
}
}
else if (eObjKind == PRESOBJ_OUTLINE)
{
if (bMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPOUTLINE ) );
+ aString = SdResId( STR_PRESOBJ_MPOUTLINE ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_OUTLINE ) );
+ aString = SdResId( STR_PRESOBJ_OUTLINE ).toString();
}
}
else if (eObjKind == PRESOBJ_NOTES)
{
if (bMaster)
{
- aString = String ( SdResId( STR_PRESOBJ_MPNOTESTEXT ) );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTEXT ).toString();
}
else
{
- aString = String ( SdResId( STR_PRESOBJ_NOTESTEXT ) );
+ aString = SdResId( STR_PRESOBJ_NOTESTEXT ).toString();
}
}
else if (eObjKind == PRESOBJ_TEXT)
{
- aString = String ( SdResId( STR_PRESOBJ_TEXT ) );
+ aString = SdResId( STR_PRESOBJ_TEXT ).toString();
}
else if (eObjKind == PRESOBJ_GRAPHIC)
{
- aString = String ( SdResId( STR_PRESOBJ_GRAPHIC ) );
+ aString = SdResId( STR_PRESOBJ_GRAPHIC ).toString();
}
else if (eObjKind == PRESOBJ_OBJECT)
{
- aString = String ( SdResId( STR_PRESOBJ_OBJECT ) );
+ aString = SdResId( STR_PRESOBJ_OBJECT ).toString();
}
else if (eObjKind == PRESOBJ_CHART)
{
- aString = String ( SdResId( STR_PRESOBJ_CHART ) );
+ aString = SdResId( STR_PRESOBJ_CHART ).toString();
}
else if (eObjKind == PRESOBJ_ORGCHART)
{
- aString = String ( SdResId( STR_PRESOBJ_ORGCHART ) );
+ aString = SdResId( STR_PRESOBJ_ORGCHART ).toString();
}
else if (eObjKind == PRESOBJ_TABLE)
{
- aString = String ( SdResId( STR_PRESOBJ_TABLE ) );
+ aString = SdResId( STR_PRESOBJ_TABLE ).toString();
}
return(aString);
diff --git a/binfilter/bf_sd/source/core/sd_stlpool.cxx b/binfilter/bf_sd/source/core/sd_stlpool.cxx
index 66107cb54..882ccfa61 100644
--- a/binfilter/bf_sd/source/core/sd_stlpool.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlpool.cxx
@@ -128,7 +128,7 @@ namespace binfilter {
/*N*/ {
/*N*/ String aName(rLayoutName);
/*N*/ aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aName += String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aName += SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ SfxStyleSheetBase* pResult = Find(aName, SD_LT_FAMILY);
/*N*/ return pResult;
/*N*/ }
@@ -151,7 +151,7 @@ namespace binfilter {
/*N*/ {
/*N*/ String aName(rLayoutName);
/*N*/ aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aName += String(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ aName += SdResId(STR_LAYOUT_OUTLINE).toString();
/*N*/ List* pList = new List;
/*N*/ for (USHORT nSheet = 1; nSheet < 10; nSheet++)
/*N*/ {
@@ -199,7 +199,7 @@ namespace binfilter {
/**************************************************************************
* Gliederungsebenen
**************************************************************************/
-/*N*/ String aName(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ String aName(SdResId(STR_LAYOUT_OUTLINE).toString());
/*N*/ String aHelpFile;
/*N*/
/*N*/ SfxStyleSheetBase* pParent = NULL;
@@ -352,7 +352,7 @@ namespace binfilter {
/**************************************************************************
* Titel
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aName = SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -395,7 +395,7 @@ namespace binfilter {
* Untertitel
* Aenderugen auch in AdjustLRSpaceItems() vornehmen!
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_SUBTITLE));
+/*N*/ aName = SdResId(STR_LAYOUT_SUBTITLE).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -440,7 +440,7 @@ namespace binfilter {
/**************************************************************************
* Notizen
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_NOTES));
+/*N*/ aName = SdResId(STR_LAYOUT_NOTES).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -487,7 +487,7 @@ namespace binfilter {
/**************************************************************************
* Hintergrundobjekte
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+/*N*/ aName = SdResId(STR_LAYOUT_BACKGROUNDOBJECTS).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -507,7 +507,7 @@ namespace binfilter {
/**************************************************************************
* Hintergrund
**************************************************************************/
-/*N*/ aName = String(SdResId(STR_LAYOUT_BACKGROUND));
+/*N*/ aName = SdResId(STR_LAYOUT_BACKGROUND).toString();
/*N*/ aName.Insert(aPrefix, 0);
/*N*/
/*N*/ if (!Find(aName, SD_LT_FAMILY))
@@ -588,7 +588,7 @@ namespace binfilter {
/*N*/
/*N*/ USHORT nLclMask = SFXSTYLEBIT_USED;
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_TITLE).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -597,7 +597,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_SUBTITLE).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -606,7 +606,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -615,7 +615,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_BACKGROUND).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -624,7 +624,7 @@ namespace binfilter {
/*N*/ }
/*N*/ pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
/*N*/
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_NOTES).toString();
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
@@ -635,7 +635,7 @@ namespace binfilter {
/*N*/
/*N*/ pParent = NULL;
/*N*/ SetSearchMask(SFX_STYLE_FAMILY_PSEUDO);
-/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ aName = SdResId(STR_PSEUDOSHEET_OUTLINE).toString();
/*N*/ for (USHORT nLevel = 1; nLevel < 10; nLevel++)
/*N*/ {
/*N*/ String aLevelName(aName);
@@ -726,7 +726,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if( nNameId )
/*N*/ {
-/*N*/ aNewName = String( SdResId( nNameId ) );
+/*N*/ aNewName = SdResId( nNameId ).toString();
/*N*/ if( nNameId == STR_PSEUDOSHEET_OUTLINE )
/*N*/ {
/*N*/ aNewName.Append( sal_Unicode( ' ' ));
@@ -769,79 +769,79 @@ namespace binfilter {
/*N*/ USHORT nNewId = 0;
/*N*/ if( eFam == SFX_STYLE_FAMILY_PARA )
/*N*/ {
-/*N*/ if( aOldName == String( SdResId( STR_STANDARD_STYLESHEET_NAME ) ) ||
+/*N*/ if( aOldName == String( SdResId( STR_STANDARD_STYLESHEET_NAME ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Standard", 0, RTL_CONSTASCII_LENGTH( "Standard" )) )
/*N*/ nNewId = HID_STANDARD_STYLESHEET_NAME;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHARROW ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHARROW ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Objekt mit Pfeilspitze", 0, RTL_CONSTASCII_LENGTH( "Objekt mit Pfeilspitze" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHARROW;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHSHADOW ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHSHADOW ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Objekt mit Schatten", 0, RTL_CONSTASCII_LENGTH( "Objekt mit Schatten" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHSHADOW;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_OBJWITHOUTFILL_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Objekt ohne Füllung", 0, RTL_CONSTASCII_LENGTH( "Objekt ohne Füllung" )) )
/*N*/ nNewId = HID_POOLSHEET_OBJWITHOUTFILL;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXT ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXT ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Text", 0, RTL_CONSTASCII_LENGTH( "Text" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXT;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY ).toString() ) ||
+/*N*/ aOldName == String(SdResId( STR_POOLSHEET_TEXTBODY_NT ).toString()) )
/*N*/ //aOldName.EqualsAscii( "Textkörper", 0, RTL_CONSTASCII_LENGTH( "Textkörper" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_JUSTIFY_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Textkörper Blocksatz", 0, RTL_CONSTASCII_LENGTH( "Textkörper Blocksatz" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY_JUSTIFY;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_TEXTBODY_INDENT_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Textkörper Einzug", 0, RTL_CONSTASCII_LENGTH( "Textkörper Einzug" )) )
/*N*/ nNewId = HID_POOLSHEET_TEXTBODY_INDENT;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE1 ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE1 ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel1", 0, RTL_CONSTASCII_LENGTH( "Titel1" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE1;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE2 ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_TITLE2 ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel2", 0, RTL_CONSTASCII_LENGTH( "Titel2" )) )
/*N*/ nNewId = HID_POOLSHEET_TITLE2;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift", 0, RTL_CONSTASCII_LENGTH( "Überschrift" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1 ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1 ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE1_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift1", 0, RTL_CONSTASCII_LENGTH( "Überschrift1" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE1;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2 ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2 ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_HEADLINE2_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Überschrift2", 0, RTL_CONSTASCII_LENGTH( "Überschrift2" )) )
/*N*/ nNewId = HID_POOLSHEET_HEADLINE2;
-/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_MEASURE ) ) ||
-/*N*/ aOldName == String( SdResId( STR_POOLSHEET_MEASURE_NT ) ) )
+/*N*/ else if( aOldName == String( SdResId( STR_POOLSHEET_MEASURE ).toString() ) ||
+/*N*/ aOldName == String( SdResId( STR_POOLSHEET_MEASURE_NT ).toString() ) )
/*N*/ //aOldName.EqualsAscii( "Maßlinie", 0, RTL_CONSTASCII_LENGTH( "Maßlinie" )) )
/*N*/ nNewId = HID_POOLSHEET_MEASURE;
/*N*/ }
/*N*/ else if( eFam == SFX_STYLE_FAMILY_PSEUDO )
/*N*/ {
-/*N*/ String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ) );
+/*N*/ String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ).toString() );
/*N*/ aStr.Append( sal_Unicode( ' ' ));
/*N*/ String aStr2( RTL_CONSTASCII_USTRINGPARAM( "Gliederung " ));
/*N*/
-/*N*/ if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ) ) ||
+/*N*/ if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )))
/*N*/ nNewId = HID_PSEUDOSHEET_TITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_SUBTITLE ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_SUBTITLE ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Untertitel", 0, RTL_CONSTASCII_LENGTH( "Untertitel" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_SUBTITLE;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Hintergrundobjekte", 0, RTL_CONSTASCII_LENGTH( "Hintergrundobjekte" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_BACKGROUNDOBJECTS;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUND ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_BACKGROUND ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Hintergrund", 0, RTL_CONSTASCII_LENGTH( "Hintergrund" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_BACKGROUND;
-/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_NOTES ) ) ||
+/*N*/ else if( aOldName == String( SdResId( STR_PSEUDOSHEET_NOTES ).toString() ) ||
/*N*/ aOldName.EqualsAscii( "Notizen", 0, RTL_CONSTASCII_LENGTH( "Notizen" )) )
/*N*/ nNewId = HID_PSEUDOSHEET_NOTES;
/*N*/ else if( aOldName.Equals( String( String( aStr ).Append( String( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1" ) ) ) ) ) ) ||
@@ -933,12 +933,12 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ String aOutlineName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aOutlineName += String(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ aOutlineName += SdResId(STR_PSEUDOSHEET_OUTLINE).toString();
/*N*/ String aTitleName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aTitleName += String(SdResId(STR_PSEUDOSHEET_TITLE));
+/*N*/ aTitleName += SdResId(STR_PSEUDOSHEET_TITLE).toString();
/*N*/ String aSubtitleName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-/*N*/ aSubtitleName += String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
-/*N*/ String aStandardName(SdResId(STR_STANDARD_STYLESHEET_NAME));
+/*N*/ aSubtitleName += SdResId(STR_PSEUDOSHEET_SUBTITLE).toString();
+/*N*/ String aStandardName(SdResId(STR_STANDARD_STYLESHEET_NAME).toString());
/*N*/ SfxStyleSheet* pSheetOutlineLevelOne = NULL;
/*N*/
/*N*/ for (size_t n = 0; n < nCount; n++)
diff --git a/binfilter/bf_sd/source/core/sd_stlsheet.cxx b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
index 1f85b88a0..6a38a894a 100644
--- a/binfilter/bf_sd/source/core/sd_stlsheet.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
@@ -289,34 +289,34 @@ namespace binfilter {
/*N*/ // Namen (unabhaengig von der Landessprache) mappen
/*N*/ String aInternalName;
/*N*/
-/*N*/ if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
+/*N*/ if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_TITLE).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_TITLE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_TITLE).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_SUBTITLE).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_SUBTITLE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_SUBTITLE).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_BACKGROUND));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_BACKGROUND).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_BACKGROUNDOBJECTS).toString();
/*N*/ }
-/*N*/ else if (aName == String(SdResId(STR_PSEUDOSHEET_NOTES)))
+/*N*/ else if (aName.Equals(String(SdResId(STR_PSEUDOSHEET_NOTES).toString())))
/*N*/ {
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_NOTES));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_NOTES).toString();
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
+/*N*/ String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE).toString());
/*N*/ USHORT nPos = aName.Search(aOutlineStr);
/*N*/ if (nPos != STRING_NOTFOUND)
/*N*/ {
/*N*/ String aNumStr(aName.Copy(aOutlineStr.Len()));
-/*N*/ aInternalName = String(SdResId(STR_LAYOUT_OUTLINE));
+/*N*/ aInternalName = SdResId(STR_LAYOUT_OUTLINE).toString();
/*N*/ aInternalName += aNumStr;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 01a84a78b..d9df01139 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -79,7 +79,7 @@ SdFilter::~SdFilter()
void SdFilter::CreateProgress()
{
- mpProgress = new SfxProgress( &mrDocShell, String( SdResId( STR_LOAD_DOC ) ), 100 );
+ mpProgress = new SfxProgress( &mrDocShell, SdResId( STR_LOAD_DOC ).toString(), 100 );
mpProgress->SetState( 0, 100 );
}
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
index e7dee5fb3..53e1c5eee 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
@@ -381,15 +381,15 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_30);
*pFormat = SOT_FORMATSTR_ID_STARDRAW;
*pAppName = String(RTL_CONSTASCII_USTRINGPARAM("Sdraw 3.1"));
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_31));;
- *pShortTypeName = String(SdResId(STR_IMPRESS_DOCUMENT));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_31).toString();;
+ *pShortTypeName = SdResId(STR_IMPRESS_DOCUMENT).toString();
}
else if (nFileFormat == SOFFICE_FILEFORMAT_40)
{
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_40);
*pFormat = SOT_FORMATSTR_ID_STARDRAW_40;
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_40));
- *pShortTypeName = String(SdResId(STR_IMPRESS_DOCUMENT));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_40).toString();
+ *pShortTypeName = SdResId(STR_IMPRESS_DOCUMENT).toString();
}
else
{
@@ -399,19 +399,19 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
{
*pClassName = SvGlobalName(BF_SO3_SDRAW_CLASSID_50);
*pFormat = SOT_FORMATSTR_ID_STARDRAW_50;
- *pFullTypeName = String(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_50));
+ *pFullTypeName = SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_50).toString();
}
else
{
*pClassName = SvGlobalName(BF_SO3_SIMPRESS_CLASSID_50);
*pFormat = SOT_FORMATSTR_ID_STARIMPRESS_50;
- *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_50));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_50).toString();
}
}
else if (nFileFormat == SOFFICE_FILEFORMAT_CURRENT)
{
- *pFullTypeName = String(SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
- STR_GRAPHIC_DOCUMENT_FULLTYPE_60 : STR_IMPRESS_DOCUMENT_FULLTYPE_60 ));
+ *pFullTypeName = SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
+ STR_GRAPHIC_DOCUMENT_FULLTYPE_60 : STR_IMPRESS_DOCUMENT_FULLTYPE_60 ).toString();
if(eDocType == DOCUMENT_TYPE_DRAW)
{
@@ -426,8 +426,8 @@ void SdDrawDocShell::FillClass(SvGlobalName* pClassName,ULONG* pFormat, String*
}
- *pShortTypeName = String(SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
- STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ));
+ *pShortTypeName = SdResId( (eDocType == DOCUMENT_TYPE_DRAW) ?
+ STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ).toString();
}
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
index 4fe3256f1..d02585748 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
@@ -99,7 +99,7 @@ String SdUnoGraphicStyleFamily::getInternalStyleName( const OUString& rName ) th
{
if( rName.compareToAscii( pMap->mpName ) == 0 )
{
- String aStr( SdResId(pMap->mnResId) );
+ String aStr( SdResId(pMap->mnResId).toString() );
return aStr;
}
@@ -132,7 +132,7 @@ OUString SdUnoGraphicStyleFamily::getExternalStyleName( const String& rName ) th
struct SdUnoGStyleNameMapper_s* pMap = SdUnoGStyleNameMapper;
while( pMap->mpName )
{
- String aCompare( SdResId(pMap->mnResId) );
+ String aCompare( SdResId(pMap->mnResId).toString() );
if( rName == aCompare )
return OUString::createFromAscii( pMap->mpName );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
index 05089bd09..7001a53c6 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
@@ -436,7 +436,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
// Ueberpruefung auf schon vorhandene Namen
while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
{
- aLayerName = String(SdResId(STR_LAYER));
+ aLayerName = SdResId(STR_LAYER).toString();
aLayerName += String::CreateFromInt32( (sal_Int32)nLayer );
nLayer++;
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 0ca24d8d3..282be3eac 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1655,7 +1655,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
nInsertPos = nMPageCount;
// now generate a unique name for the new masterpage
- const String aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME) );
+ const String aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME).toString() );
String aPrefix( aStdPrefix );
sal_Bool bUnique = sal_True;
@@ -1685,7 +1685,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
String aLayoutName( aPrefix );
aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+ aLayoutName += SdResId(STR_LAYOUT_OUTLINE).toString();
// create styles
((SdStyleSheetPool*)pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index c0f4343c9..857744cde 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -1387,7 +1387,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
{
sal_Int32 nPageNumber = aStrBookmark.copy( aApiPageName.getLength() ).toInt32();
OUStringBuffer sBuffer;
- String aPageName( SdResId(STR_PAGE) );
+ String aPageName( SdResId(STR_PAGE).toString() );
sBuffer.append( aPageName );
sBuffer.append( sal_Unicode( ' ' ) );
sBuffer.append( nPageNumber );
@@ -1604,7 +1604,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
break;
case presentation::ClickAction_BOOKMARK:
{
- String aPageName( SdResId(STR_PAGE) );
+ String aPageName( SdResId(STR_PAGE).toString() );
aPageName += sal_Unicode( ' ' );
const OUString aStrBookmark( pInfo->aBookmark );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 86eb77b03..7fafd61d9 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -1404,7 +1404,7 @@ OUString SdDrawPage::getPageApiNameFromUiName( const String& rUIName )
{
OUString aApiName;
- String aDefPageName(SdResId(STR_PAGE));
+ String aDefPageName(SdResId(STR_PAGE).toString());
aDefPageName += sal_Unicode( ' ' );
if( rUIName.Equals( aDefPageName, 0, aDefPageName.Len() ) )
@@ -1448,7 +1448,7 @@ String SdDrawPage::getUiNameFromPageApiName( const ::rtl::OUString& rApiName )
if( nPageNumber != -1)
{
OUStringBuffer sBuffer;
- sBuffer.append( String(SdResId(STR_PAGE)) );
+ sBuffer.append( SdResId(STR_PAGE).toString() );
sBuffer.append( sal_Unicode( ' ' ) );
sBuffer.append( aNumber );
return sBuffer.makeStringAndClear();
@@ -2042,7 +2042,7 @@ void SdMasterPage::setBackground( const uno::Any& rValue )
SfxStyleSheetBase* pStyleSheet = NULL;
if(pSSPool)
{
- String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString());
pStyleSheet = pSSPool->Find( aStr, SFX_STYLE_FAMILY_PSEUDO);
if( pStyleSheet )
@@ -2098,7 +2098,7 @@ void SdMasterPage::getBackground( uno::Any& rValue ) throw()
SfxStyleSheetBase* pStyleSheet = NULL;
if(pSSPool)
{
- String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ String aStr(SdResId(STR_PSEUDOSHEET_BACKGROUND).toString());
pStyleSheet = pSSPool->Find( aStr, SFX_STYLE_FAMILY_PSEUDO);
if( pStyleSheet )
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
index 00c814eb4..b023a7c14 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
@@ -107,7 +107,7 @@ OUString SdUnoPseudoStyleFamily::getExternalStyleName( const String& rStyleName
for( nIndex = 0; nIndex < nPseudoStyleCount; nIndex++ )
{
SdResId aRID(StyleNameMapping[nIndex].mnRID);
- String aCompareString(aRID);
+ String aCompareString(aRID.toString());
if( StyleNameMapping[nIndex].mnRID == STR_LAYOUT_OUTLINE )
{
@@ -280,7 +280,7 @@ void SdUnoPseudoStyleFamily::createStyle( sal_uInt16 nIndex, uno::Any& rAny ) th
sal_uInt16 nRID = StyleNameMapping[nIndex].mnRID;
SdResId aRID(nRID);
- aLayoutName += String(aRID);
+ aLayoutName += aRID.toString();
if( STR_LAYOUT_OUTLINE == nRID )
{
generated by cgit (git 2.34.1) at 2024-06-09 14:37:22 +0000