[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Mon Jul 29 00:48:35 PDT 2013
sd/source/filter/grf/sdgrffilter.cxx | 2 +-
sd/source/filter/html/htmlex.cxx | 18 +++++++++---------
sd/source/filter/ppt/pptin.cxx | 8 ++++----
sd/source/filter/xml/sdxmlwrp.cxx | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 40c5338fdd817878d9dd6240f7f3629b413120a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 28 20:17:39 2013 +0100
String(SdResId(x)) -> SD_RESSTR(x)
Change-Id: I13e3343cc1fff2a443559e6d6dbd6ec887b5f3e6
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 8c9af66..6794c96 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -183,7 +183,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
else
{
- ErrorBox aErrorBox( NULL, WB_OK, String( SdResId( nId ) ) );
+ ErrorBox aErrorBox(NULL, WB_OK, SD_RESSTR(nId));
aErrorBox.Execute();
}
}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index adf36cb..60daba3 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -91,7 +91,7 @@ using namespace ::com::sun::star::document;
// get parameter from Itemset
-#define RESTOHTML( res ) StringToHTMLString(String(SdResId(res)))
+#define RESTOHTML( res ) StringToHTMLString(SD_RESSTR(res))
const char *pButtonNames[] =
{
@@ -2371,7 +2371,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "<center>\r\n" );
// first page
- aButton = String(SdResId(STR_HTMLEXP_FIRSTPAGE));
+ aButton = SD_RESSTR(STR_HTMLEXP_FIRSTPAGE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
BTN_FIRST_0:BTN_FIRST_1)), aButton);
@@ -2383,7 +2383,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "\r\n" );
// to the previous page
- aButton = String(SdResId(STR_PUBLISH_BACK));
+ aButton = SD_RESSTR(STR_PUBLISH_BACK);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
BTN_PREV_0:BTN_PREV_1)), aButton);
@@ -2395,7 +2395,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "\r\n" );
// to the next page
- aButton = String(SdResId(STR_PUBLISH_NEXT));
+ aButton = SD_RESSTR(STR_PUBLISH_NEXT);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
BTN_NEXT_0:BTN_NEXT_1)), aButton);
@@ -2407,7 +2407,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "\r\n" );
// to the last page
- aButton = String(SdResId(STR_HTMLEXP_LASTPAGE));
+ aButton = SD_RESSTR(STR_HTMLEXP_LASTPAGE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
BTN_LAST_0:BTN_LAST_1)), aButton);
@@ -2426,7 +2426,7 @@ bool HtmlExport::CreateNavBarFrames()
// content
if (mbContentsPage)
{
- aButton = String(SdResId(STR_PUBLISH_OUTLINE));
+ aButton = SD_RESSTR(STR_PUBLISH_OUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_INDEX), aButton);
@@ -2438,7 +2438,7 @@ bool HtmlExport::CreateNavBarFrames()
// text mode
if(mbImpress)
{
- aButton = String(SdResId(STR_HTMLEXP_SETTEXT));
+ aButton = SD_RESSTR(STR_HTMLEXP_SETTEXT);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_TEXT), aButton);
@@ -2471,7 +2471,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "</title>\r\n</head>\r\n" );
aStr += CreateBodyTag();
- aButton = String(SdResId(STR_HTMLEXP_OUTLINE));
+ aButton = SD_RESSTR(STR_HTMLEXP_OUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_MORE), aButton);
@@ -2496,7 +2496,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "</title>\r\n</head>\r\n" );
aStr += CreateBodyTag();
- aButton = String(SdResId(STR_HTMLEXP_NOOUTLINE));
+ aButton = SD_RESSTR(STR_HTMLEXP_NOOUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_LESS), aButton);
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5ca9322..5561078 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -573,7 +573,7 @@ sal_Bool ImplSdPPTImport::Import()
///////////////////
// standardsheet //
///////////////////
- pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( String(SdResId( STR_STANDARD_STYLESHEET_NAME )), SD_STYLE_FAMILY_GRAPHICS );
+ pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS );
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -586,7 +586,7 @@ sal_Bool ImplSdPPTImport::Import()
}
// PSEUDO
- pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( String(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS )), SD_STYLE_FAMILY_PSEUDO );
+ pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO );
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -2251,10 +2251,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case PRESOBJ_SLIDENUMBER :
case PRESOBJ_FOOTER :
case PRESOBJ_HEADER :
- pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( String(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS )), SD_STYLE_FAMILY_PSEUDO );
+ pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO );
break;
default :
- pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( String(SdResId( STR_STANDARD_STYLESHEET_NAME )), SD_STYLE_FAMILY_GRAPHICS );
+ pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS );
}
}
break;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 161aa92..69bca65 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -542,7 +542,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
sal_Int32 nProgressRange(1000000);
sal_Int32 nProgressCurrent(0);
- OUString aMsg = String( SdResId( STR_LOAD_DOC ) );
+ OUString aMsg(SD_RESSTR(STR_LOAD_DOC));
mxStatusIndicator->start(aMsg, nProgressRange);
// set ProgressRange
@@ -937,7 +937,7 @@ sal_Bool SdXMLFilter::Export()
{
sal_Int32 nProgressRange(1000000);
sal_Int32 nProgressCurrent(0);
- OUString aMsg = String( SdResId( STR_SAVE_DOC ) );
+ OUString aMsg(SD_RESSTR(STR_SAVE_DOC));
mxStatusIndicator->start(aMsg, nProgressRange);
// set ProgressRange
More information about the Libreoffice-commits
mailing list