Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4107
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/4107/1
Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)
Change-Id: I179208d5ffe94e95719c7c6d0ea4eb354141531a
---
M sd/source/core/CustomAnimationPreset.cxx
M sd/source/core/drawdoc3.cxx
M sd/source/core/drawdoc4.cxx
M sd/source/core/sdpage.cxx
M sd/source/core/stlfamily.cxx
M sd/source/core/stlpool.cxx
M sd/source/filter/eppt/pptx-text.cxx
M sd/source/filter/html/buttonset.cxx
M sd/source/filter/html/htmlex.cxx
M sd/source/filter/ppt/pptin.cxx
M sd/source/filter/xml/sdxmlwrp.cxx
M sd/source/ui/app/sdmod.cxx
M sd/source/ui/dlg/TemplateScanner.cxx
M sd/source/ui/dlg/diactrl.cxx
M sd/source/ui/dlg/dlgass.cxx
M sd/source/ui/dlg/dlgolbul.cxx
M sd/source/ui/dlg/present.cxx
M sd/source/ui/dlg/prltempl.cxx
M sd/source/ui/dlg/unchss.cxx
M sd/source/ui/func/fudraw.cxx
M sd/source/ui/func/fuolbull.cxx
M sd/source/ui/func/futempl.cxx
M sd/source/ui/sidebar/CustomAnimationPanel.cxx
M sd/source/ui/sidebar/LayoutMenu.cxx
M sd/source/ui/sidebar/PanelBase.cxx
M sd/source/ui/sidebar/PanelFactory.cxx
M sd/source/ui/sidebar/SlideTransitionPanel.cxx
M sd/source/ui/sidebar/TableDesignPanel.cxx
28 files changed, 102 insertions(+), 110 deletions(-)
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 91b0836..619b8d2 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -471,7 +471,7 @@
else
{
aMissedPresetIds += String(*pEffectNames);
- aMissedPresetIds += String( RTL_CONSTASCII_USTRINGPARAM("\n") );
+ aMissedPresetIds += String( "\n" );
}
#endif
pEffectNames++;
@@ -491,7 +491,7 @@
#ifdef DEBUG
if( aMissedPresetIds.Len() )
{
- OStringBuffer
aTmp(RTL_CONSTASCII_STRINGPARAM("sd::CustomAnimationPresets::importPresets(), invalid preset
id!\n"));
+ OStringBuffer aTmp("sd::CustomAnimationPresets::importPresets(), invalid preset id!\n");
aTmp.append(OUStringToOString(aMissedPresetIds,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aTmp.getStr());
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 903998c..e72a103 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1667,7 +1667,7 @@
}
aName = aTest;
String aPageLayoutName(aName);
- aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
// Generate new stylesheets
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 040413c..6954913 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1110,7 +1110,7 @@
// Now set the layout name of the drawing and the notes page, as well as
// their master pages.
String aPageLayoutName(rNewName);
- aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
// Inform all text objects on pages that use the renamed layout and set the
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 48d5662..6c4faf3 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -561,7 +561,7 @@
SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
{
String aName(GetLayoutName());
- String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ String aSep( SD_LT_SEPARATOR );
sal_uInt16 nPos = aName.Search(aSep);
if (nPos != STRING_NOTFOUND)
@@ -580,7 +580,7 @@
SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
{
String aName(GetLayoutName());
- String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ String aSep( SD_LT_SEPARATOR );
sal_uInt16 nPos = aName.Search(aSep);
if (nPos != STRING_NOTFOUND)
{
@@ -631,7 +631,7 @@
SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
{
String aStyleName( pPage->GetLayoutName() );
- const String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ const String aSep( SD_LT_SEPARATOR );
aStyleName.Erase(aStyleName.Search(aSep) + aSep.Len());
sal_uInt16 nNameId;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 2f140a2..a38791d 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -68,7 +68,7 @@
maLayoutName = mxMasterPage->GetLayoutName();
String aLayoutName( maLayoutName );
- const sal_uInt16 nLen = aLayoutName.Search(String(
RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR)))+4;
+ const sal_uInt16 nLen = aLayoutName.Search(String( SD_LT_SEPARATOR ))+4;
aLayoutName.Erase( nLen );
if( (maStyleSheets.empty()) || !((*maStyleSheets.begin()).second->GetName().Equals(
aLayoutName, 0, nLen )) )
@@ -209,7 +209,7 @@
throw DisposedException();
String aLayoutName( pPage->GetLayoutName() );
- const String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ const String aSep( SD_LT_SEPARATOR );
aLayoutName.Erase(aLayoutName.Search(aSep));
return OUString( aLayoutName );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index ffa64d5..a64ed0d 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -123,7 +123,7 @@
SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
{
String aName(rLayoutName);
- aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aName.AppendAscii( SD_LT_SEPARATOR );
aName += String(SdResId(STR_LAYOUT_TITLE));
SfxStyleSheetBase* pResult = Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
return pResult;
@@ -139,7 +139,7 @@
void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName,
std::vector<SfxStyleSheetBase*> &rOutlineStyles)
{
String aName(rLayoutName);
- aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aName.AppendAscii( SD_LT_SEPARATOR );
aName += String(SdResId(STR_LAYOUT_OUTLINE));
for (sal_uInt16 nSheet = 1; nSheet < 10; nSheet++)
@@ -170,7 +170,7 @@
SfxStyleSheetBase* pSheet = NULL;
String aPrefix(rLayoutName);
- String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ String aSep( SD_LT_SEPARATOR );
aPrefix.Insert(aSep);
Font aLatinFont, aCJKFont, aCTLFont;
@@ -715,7 +715,7 @@
void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::vector<String>
&aNameList) const
{
String aPrefix(rLayoutName);
- String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+ String aSep( SD_LT_SEPARATOR );
aPrefix.Insert(aSep);
String aName(SdResId(STR_LAYOUT_OUTLINE));
@@ -761,7 +761,7 @@
void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector&
rLayoutSheets )
{
String aLayoutNameWithSep(rLayoutName);
- aLayoutNameWithSep.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aLayoutNameWithSep.AppendAscii( SD_LT_SEPARATOR );
sal_uInt16 nLen = aLayoutNameWithSep.Len();
SfxStyleSheetIterator aIter(this, SD_STYLE_FAMILY_MASTERPAGE);
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index e96a03f..94ceab4 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -926,9 +926,9 @@
case SVX_NUM_CHARS_UPPER_LETTER :
case SVX_NUM_CHARS_UPPER_LETTER_N :
{
- if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+ if ( sSuffix == String( ")" ) )
{
- if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" )
) )
+ if ( sPrefix == String( "(" ) )
nMappedNumType = 0xa0001; // (A)
else
nMappedNumType = 0xb0001; // A)
@@ -940,9 +940,9 @@
case SVX_NUM_CHARS_LOWER_LETTER :
case SVX_NUM_CHARS_LOWER_LETTER_N :
{
- if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+ if ( sSuffix == String( ")" ) )
{
- if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" )
) )
+ if ( sPrefix == String( "(" ) )
nMappedNumType = 0x80001; // (a)
else
nMappedNumType = 0x90001; // a)
@@ -953,9 +953,9 @@
break;
case SVX_NUM_ROMAN_UPPER :
{
- if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+ if ( sSuffix == String( ")" ) )
{
- if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" )
) )
+ if ( sPrefix == String( "(" ) )
nMappedNumType = 0xe0001; // (I)
else
nMappedNumType = 0xf0001; // I)
@@ -966,9 +966,9 @@
break;
case SVX_NUM_ROMAN_LOWER :
{
- if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+ if ( sSuffix == String( ")" ) )
{
- if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" )
) )
+ if ( sPrefix == String( "(" ) )
nMappedNumType = 0x40001; // (i)
else
nMappedNumType = 0x50001; // i)
@@ -979,9 +979,9 @@
break;
case SVX_NUM_ARABIC :
{
- if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+ if ( sSuffix == String( ")" ) )
{
- if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" )
) )
+ if ( sPrefix == String( "(" ) )
nMappedNumType = 0xc0001; // (1)
else
nMappedNumType = 0x20001; // 1)
@@ -1054,7 +1054,7 @@
void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool
bGetPropStateValue )
{
- static String sNumberingLevel ( RTL_CONSTASCII_USTRINGPARAM( "NumberingLevel" ) );
+ static String sNumberingLevel( "NumberingLevel" );
::com::sun::star::uno::Any aAny;
if ( GetPropertyValue( aAny, mXPropSet, sNumberingLevel, sal_True ) )
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 3f7daf1..9e0c36a 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -177,7 +177,7 @@
if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
{
OUString sFileName( aStatus.getFileName() );
- if( sFileName.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(".zip" ) )
)
+ if( sFileName.endsWithIgnoreAsciiCase( ".zip" ) )
maButtons.push_back( boost::shared_ptr< ButtonsImpl >( new ButtonsImpl(
aStatus.getFileURL() ) ) );
}
}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index bc5891b..5d636b5 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -338,14 +338,14 @@
{
SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) );
- String sStyle( RTL_CONSTASCII_USTRINGPARAM("direction:") );
+ String sStyle( "direction:" );
if( static_cast<const SvxFrameDirectionItem*>(aParaSet.GetItem( EE_PARA_WRITINGDIR
))->GetValue() == FRMDIR_HORI_RIGHT_TOP )
{
- sStyle += String( RTL_CONSTASCII_USTRINGPARAM("rtl;") );
+ sStyle += String( "rtl;" );
}
else
{
- sStyle += String( RTL_CONSTASCII_USTRINGPARAM("ltr;") );
+ sStyle += String( "ltr;" );
}
return sStyle;
}
@@ -2037,7 +2037,7 @@
SdPage* pPage = maPages[ nSdPage ];
aStr.AppendAscii( "<div align=\"left\">" );
- String aLink( RTL_CONSTASCII_USTRINGPARAM( "JavaScript:parent.NavigateAbs(" ) );
+ String aLink( "JavaScript:parent.NavigateAbs(" );
aLink += OUString::number(nSdPage);
aLink.Append( sal_Unicode(')') );
@@ -2093,14 +2093,14 @@
pName = new String(maIndex);
else
{
- pName = new String( RTL_CONSTASCII_USTRINGPARAM("img") );
+ pName = new String( "img" );
*pName += OUString::number(nSdPage);
*pName += maHTMLExtension;
}
mpHTMLFiles[nSdPage] = pName;
- pName = new String( RTL_CONSTASCII_USTRINGPARAM("img") );
+ pName = new String( "img" );
*pName += OUString::number(nSdPage);
if( meFormat==FORMAT_GIF )
pName->AppendAscii( ".gif" );
@@ -2111,7 +2111,7 @@
mpImageFiles[nSdPage] = pName;
- pName = new String( RTL_CONSTASCII_USTRINGPARAM("thumb") );
+ pName = new String( "thumb" );
*pName += OUString::number(nSdPage);
if( meFormat!=FORMAT_JPG )
pName->AppendAscii( ".png" );
@@ -2120,7 +2120,7 @@
mpThumbnailFiles[nSdPage] = pName;
- pName = new String( RTL_CONSTASCII_USTRINGPARAM("text"));
+ pName = new String( "text" );
*pName += OUString::number(nSdPage);
*pName += maHTMLExtension;
mpTextFiles[nSdPage] = pName;
@@ -2239,10 +2239,9 @@
bool HtmlExport::CreateFrames()
{
String aTmp;
- String aStr( RTL_CONSTASCII_USTRINGPARAM(
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\r\n"
+ String aStr( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\r\n"
" \"http://www.w3.org/TR/html4/frameset.dtd\";>\r\n"
- "<html>\r\n<head>\r\n" ) );
+ "<html>\r\n<head>\r\n" );
aStr += WriteMetaCharset();
aStr.AppendAscii( " <title>" );
@@ -2260,12 +2259,12 @@
if(mbNotes)
{
- String aSlash( RTL_CONSTASCII_USTRINGPARAM( "//" ) );
+ String aSlash( "//" );
aFunction.SearchAndReplaceAll(aSlash, OUString());
}
// substitute HTML file extension
- String aPlaceHolder(RTL_CONSTASCII_USTRINGPARAM(".$EXT"));
+ String aPlaceHolder(".$EXT");
aFunction.SearchAndReplaceAll(aPlaceHolder, maHTMLExtension);
aStr += aFunction;
@@ -2378,7 +2377,7 @@
BTN_FIRST_0:BTN_FIRST_1)), aButton);
if(nFile != 0 && mnSdPageCount > 1)
- aButton = CreateLink(
String(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateAbs(0)")), aButton);
+ aButton = CreateLink( String("JavaScript:parent.NavigateAbs(0)"), aButton);
aStr += aButton;
aStr.AppendAscii( "\r\n" );
@@ -2390,7 +2389,7 @@
BTN_PREV_0:BTN_PREV_1)), aButton);
if(nFile != 0 && mnSdPageCount > 1)
- aButton = CreateLink(
String(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateRel(-1)")), aButton);
+ aButton = CreateLink( String("JavaScript:parent.NavigateRel(-1)"), aButton);
aStr += aButton;
aStr.AppendAscii( "\r\n" );
@@ -2402,7 +2401,7 @@
BTN_NEXT_0:BTN_NEXT_1)), aButton);
if(nFile != 2 && mnSdPageCount > 1)
- aButton =
CreateLink(String(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateRel(1)")), aButton);
+ aButton = CreateLink(String("JavaScript:parent.NavigateRel(1)"), aButton);
aStr += aButton;
aStr.AppendAscii( "\r\n" );
@@ -2415,7 +2414,7 @@
if(nFile != 2 && mnSdPageCount > 1)
{
- String aLink(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateAbs("));
+ String aLink("JavaScript:parent.NavigateAbs(");
aLink += OUString::number(mnSdPageCount-1);
aLink.AppendAscii( ")" );
aButton = CreateLink( aLink, aButton);
@@ -2432,7 +2431,7 @@
aButton = CreateImage(GetButtonName(BTN_INDEX), aButton);
// to the overview
- aStr += CreateLink(maIndex, aButton, String(RTL_CONSTASCII_USTRINGPARAM("_top")));
+ aStr += CreateLink(maIndex, aButton, String("_top"));
aStr.AppendAscii( "\r\n" );
}
@@ -2443,9 +2442,9 @@
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_TEXT), aButton);
- String aText0( RTL_CONSTASCII_USTRINGPARAM("text0"));
+ String aText0( "text0" );
aText0 += maHTMLExtension;
- aStr += CreateLink( aText0, aButton, String(RTL_CONSTASCII_USTRINGPARAM("_top")));
+ aStr += CreateLink( aText0, aButton, String("_top"));
aStr.AppendAscii( "\r\n" );
}
@@ -2453,7 +2452,7 @@
aStr.AppendAscii( "</center>\r\n" );
aStr.AppendAscii( "</body>\r\n</html>" );
- String aFileName( RTL_CONSTASCII_USTRINGPARAM("navbar") );
+ String aFileName( "navbar" );
aFileName += OUString::number(nFile);
bOk = WriteHtml( aFileName, true, aStr );
@@ -2476,10 +2475,10 @@
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_MORE), aButton);
- aStr +=
CreateLink(String(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.ExpandOutline()")), aButton);
+ aStr += CreateLink(String("JavaScript:parent.ExpandOutline()"), aButton);
aStr.AppendAscii( "</body>\r\n</html>" );
- String aFileName( RTL_CONSTASCII_USTRINGPARAM("navbar3") );
+ String aFileName( "navbar3" );
bOk = WriteHtml( aFileName, true, aStr );
@@ -2501,10 +2500,10 @@
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_LESS), aButton);
- aStr +=
CreateLink(String(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.CollapseOutline()")), aButton);
+ aStr += CreateLink(String("JavaScript:parent.CollapseOutline()"), aButton);
aStr.AppendAscii( "</body>\r\n</html>" );
- String aFileName( RTL_CONSTASCII_USTRINGPARAM("navbar4") );
+ String aFileName( "navbar4" );
bOk = WriteHtml( aFileName, true, aStr );
if (mpProgress)
@@ -2564,7 +2563,7 @@
aStrNavText = CreateImage(GetButtonName(BTN_TEXT), aStrNavText);
}
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<center>\r\n")); //<table><tr>\r\n");
+ String aStr( "<center>\r\n"); //<table><tr>\r\n");
// first page
if(nSdPage > 0)
@@ -2644,7 +2643,7 @@
// =====================================================================
String HtmlExport::CreateBodyTag() const
{
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<body") );
+ String aStr( "<body" );
if( mbUserAttr || mbDocColors )
{
@@ -2677,7 +2676,7 @@
const String& aText,
const String& aTarget ) const
{
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<a href=\""));
+ String aStr( "<a href=\"" );
aStr += StringToURL(aLink);
if(aTarget.Len())
{
@@ -2698,7 +2697,7 @@
sal_Int16 nWidth,
sal_Int16 nHeight ) const
{
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<img src=\""));
+ String aStr( "<img src=\"");
aStr += StringToURL(aImage);
aStr.AppendAscii( "\" border=0" );
@@ -2737,7 +2736,7 @@
String HtmlExport::ColorToHTMLString( Color aColor )
{
static char hex[] = "0123456789ABCDEF";
- String aStr( RTL_CONSTASCII_USTRINGPARAM("#xxxxxx"));
+ String aStr( "#xxxxxx" );
aStr.SetChar(1, hex[(aColor.GetRed() >> 4) & 0xf] );
aStr.SetChar(2, hex[aColor.GetRed() & 0xf] );
aStr.SetChar(3, hex[(aColor.GetGreen() >> 4) & 0xf] );
@@ -2756,7 +2755,7 @@
sal_uLong nCenterY,
const String& rHRef ) const
{
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"circle\" alt=\"\" coords=\"" ));
+ String aStr( "<area shape=\"circle\" alt=\"\" coords=\"" );
aStr += OUString::number(nCenterX);
aStr.Append(sal_Unicode(','));
@@ -2818,7 +2817,7 @@
String HtmlExport::CreateHTMLRectArea( const Rectangle& rRect,
const String& rHRef ) const
{
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"rect\" alt=\"\" coords=\"") );
+ String aStr( "<area shape=\"rect\" alt=\"\" coords=\"" );
aStr += OUString::number(rRect.Left());
aStr.Append(sal_Unicode(','));
@@ -2852,7 +2851,7 @@
{
if(mbFrames)
{
- String aUrl( RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateAbs("));
+ String aUrl( "JavaScript:parent.NavigateAbs(" );
aUrl += OUString::number(nPgNum);
aUrl.Append(sal_Unicode(')'));
return aUrl;
@@ -2902,15 +2901,15 @@
}
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$1")), getDocumentTitle() );
+ aScript.SearchAndReplaceAll( String("$$1"), getDocumentTitle() );
const String aSaveStr( RESTOHTML( STR_WEBVIEW_SAVE ));
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$2")), aSaveStr );
+ aScript.SearchAndReplaceAll( String("$$2"), aSaveStr );
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$3")), maCGIPath );
+ aScript.SearchAndReplaceAll( String("$$3"), maCGIPath );
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$4")),
OUString::number(mnWidthPixel) );
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$5")),
OUString::number(mnHeightPixel) );
+ aScript.SearchAndReplaceAll( String("$$4"), OUString::number(mnWidthPixel) );
+ aScript.SearchAndReplaceAll( String("$$5"), OUString::number(mnHeightPixel) );
String aDest( rPath );
@@ -2955,7 +2954,7 @@
return false;
}
- if(!CopyScript(maExportPath, String(RTL_CONSTASCII_USTRINGPARAM("edit.asp")), maIndex ))
+ if(!CopyScript(maExportPath, String("edit.asp"), maIndex ))
return false;
return true;
@@ -2997,7 +2996,7 @@
aStr.AppendAscii( "\r\n" );
}
- String aFileName( RTL_CONSTASCII_USTRINGPARAM("picture.txt") );
+ String aFileName( "picture.txt" );
bool bOk = WriteHtml( aFileName, false, aStr );
if (mpProgress)
@@ -3010,7 +3009,7 @@
bool HtmlExport::CreateImageNumberFile()
{
String aFull( maExportPath );
- String aFileName( RTL_CONSTASCII_USTRINGPARAM("currpic.txt") );
+ String aFileName( "currpic.txt" );
aFull += aFileName;
meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, aFileName );
@@ -3039,7 +3038,7 @@
if( rSoundFile.Len() == 0 )
return rSoundFile;
- String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") );
+ String aStr( "<embed src=\"" );
INetURLObject aURL( rSoundFile );
String aSoundFileName = String(aURL.getName());
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index fd66e79..6afdf37 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -616,7 +616,7 @@
aLayoutName = ( (SdPage*)mpDoc->GetMasterPage( nMasterNum - 1 )
)->GetName();
}
pPage->SetName( aLayoutName );
- aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aLayoutName.AppendAscii( SD_LT_SEPARATOR );
aLayoutName += String( SdResId( STR_LAYOUT_OUTLINE ) );
pPage->SetLayoutName( aLayoutName );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index cab013a..554fff5 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -268,8 +268,7 @@
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -304,8 +303,7 @@
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception caught while importing:\n"));
+ OStringBuffer aError("SAX exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -315,8 +313,7 @@
catch (const packages::zip::ZipIOException& r)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception caught while importing:\n"));
+ OStringBuffer aError("Zip exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -328,8 +325,7 @@
catch (const io::IOException& r)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception caught while importing:\n"));
+ OStringBuffer aError("IO exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -341,8 +337,7 @@
catch (const uno::Exception& r)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception caught while importing:\n"));
+ OStringBuffer aError("uno exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -810,8 +805,8 @@
{
const String& rTypeName = pFilter->GetRealTypeName();
- if( (rTypeName.CompareToAscii(
RTL_CONSTASCII_STRINGPARAM("impress_StarImpress" ) ) == 0) ||
- (rTypeName.CompareToAscii( RTL_CONSTASCII_STRINGPARAM("draw_StarDraw"
) ) == 0) )
+ if( (rTypeName.CompareToAscii( "impress_StarImpress" ) == 0) ||
+ (rTypeName.CompareToAscii( "draw_StarDraw" ) == 0) )
{
bTransform = true;
}
@@ -1071,8 +1066,7 @@
catch (const uno::Exception &e)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno Exception caught while exporting:\n"));
+ OStringBuffer aError("uno Exception caught while exporting:\n");
aError.append(OUStringToOString(e.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 8b8f78a..83291d1 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -203,9 +203,9 @@
}
if( DOCUMENT_TYPE_DRAW == eType )
- aStmName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Draw_" ) );
+ aStmName.AssignAscii( "Draw_" );
else
- aStmName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Impress_" ) );
+ aStmName.AssignAscii( "Impress_" );
aStmName += rOptionName;
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 5b18349..77c1acb 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -274,10 +274,10 @@
// add a new entry to the resulting list (which is created
// first if necessary).
if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE)
- ||
(sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE_OASIS)))
- ||
(sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_BIN_TEMPLATE)))
- ||
(sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE)))
- ||
(sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE_B))))
+ || (sContentType == IMPRESS_XML_TEMPLATE_OASIS)
+ || (sContentType == IMPRESS_BIN_TEMPLATE)
+ || (sContentType == IMPRESS_XML_TEMPLATE)
+ || (sContentType == IMPRESS_XML_TEMPLATE_B))
{
OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(
STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle );
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 069dd42..46d1129 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -52,7 +52,7 @@
SetCustomUnitText( aStr );
// set size
- aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "XXX" ) );
+ aStr.AppendAscii( "XXX" );
Size aSize( GetTextWidth( aStr )+20, GetTextHeight()+6 );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 787d9f3..0b362ca 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -991,7 +991,7 @@
{
aDocFile = pEntry->msPath;
- aTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
+ aTitle.AppendAscii( " (" );
aTitle.Append( pEntry->msTitle );
aTitle.Append( sal_Unicode(')') );
}
@@ -1438,7 +1438,7 @@
{
String aStrTmp( aName );
if( aName.Len() )
- aStrTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\n\n" ) );
+ aStrTmp.AppendAscii( "\n\n" );
aStrTmp.Append( aInfo );
pObj = dynamic_cast<SdrTextObj*>( pPage->GetPresObj( PRESOBJ_OUTLINE ) );
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index b0ab85b..3682671 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -98,7 +98,7 @@
{
SfxStyleSheetBasePool* pSSPool = pView->GetDocSh()->GetStyleSheetPool();
String aStyleName((SdResId(STR_LAYOUT_OUTLINE)));
- aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
+ aStyleName.AppendAscii( " 1" );
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName,
SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const
SfxPoolItem**)&pItem);
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 9fce09b..fa63859 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -172,7 +172,7 @@
sal_Int32 nDefaultExternalIndex (-1);
const sal_Int32 nDefaultSelectedDisplay (
( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue());
- const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( "%1" ) );
+ const String sPlaceHolder( "%1" );
for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ )
{
String aName( nDisplay == nExternalIndex ?
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 37e7954..ff8f9a9 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -97,7 +97,7 @@
if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem ))
{
String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE)));
- aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
+ aStyleName.AppendAscii( " 1" );
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName,
SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 6831560..489ab81 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -55,7 +55,7 @@
String aName(pStyleSheet->GetName());
// delete layout name and separator
- String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) );
+ String aSep( SD_LT_SEPARATOR );
sal_uInt16 nPos = aName.Search(aSep);
if( nPos != STRING_NOTFOUND )
aName.Erase(0, nPos + aSep.Len());
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index f5cf920..e5bdf29 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -886,7 +886,7 @@
{
// jump to object/page
aHelpText = String(SdResId(STR_CLICK_ACTION_BOOKMARK));
- aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%',
INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -895,7 +895,7 @@
{
// jump to document (object/page)
aHelpText = String(SdResId(STR_CLICK_ACTION_DOCUMENT));
- aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%',
INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -904,7 +904,7 @@
{
// execute program
aHelpText = String(SdResId(STR_CLICK_ACTION_PROGRAM));
- aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ aHelpText.AppendAscii( ": " );
aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%',
INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -913,7 +913,7 @@
{
// execute program
aHelpText = String(SdResId(STR_CLICK_ACTION_MACRO));
- aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ aHelpText.AppendAscii( ": " );
if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
{
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 5bbf4e2..6d64c98 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -350,7 +350,7 @@
{
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
String aStyleName((SdResId((sal_uInt16)STR_LAYOUT_OUTLINE)));
- aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
+ aStyleName.AppendAscii( " 1" );
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName,
SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False,
(const SfxPoolItem**)&pItem);
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index ab551c2..61a223d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -416,7 +416,7 @@
SvxNumRule
aRule(*((SvxNumBulletItem*)aTempSet.GetItem(EE_PARA_NUMBULLET))->GetNumRule());
String sStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE)));
- sStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
+ sStyleName.AppendAscii( " 1" );
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find(
sStyleName, SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index 04d0009..c2f8350 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -40,7 +40,7 @@
rViewShellBase)
{
#ifdef DEBUG
- SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:CustomAnimationPanel")));
+ SetText(OUString("sd:CustomAnimationPanel"));
#endif
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index ef6ae63..0e4b234 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -152,7 +152,7 @@
SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
#ifdef DEBUG
- SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:LayoutMenu")));
+ SetText(OUString("sd:LayoutMenu"));
#endif
}
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index 350eb88..0c04e97 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -34,7 +34,7 @@
OSL_TRACE("created PanelBase at %x for parent %x", this, pParentWindow);
#ifdef DEBUG
- SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:PanelBase")));
+ SetText(OUString("sd:PanelBase"));
#endif
}
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 2b45781..53fbe58 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -44,7 +44,7 @@
using namespace ::sd::framework;
using ::rtl::OUString;
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
+#define A2S(pString) (OUString(pString))
namespace sd {
extern ::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
@@ -91,8 +91,7 @@
::rtl::OUString PanelFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.Draw.framework.PanelFactory"));
+ return OUString("org.openoffice.comp.Draw.framework.PanelFactory");
}
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 3b4d994..79b2ae2 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -38,7 +38,7 @@
: PanelBase(pParentWindow, rViewShellBase)
{
#ifdef DEBUG
- SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:SlideTransitionPanel")));
+ SetText(OUString("sd:SlideTransitionPanel"));
#endif
}
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index 28ceb65..a8634a4 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.cxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.cxx
@@ -36,7 +36,7 @@
: PanelBase(pParentWindow, rViewShellBase)
{
#ifdef DEBUG
- SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:TableDesignPanel")));
+ SetText(OUString("sd:TableDesignPanel"));
#endif
}
--
To view, visit https://gerrit.libreoffice.org/4107
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I179208d5ffe94e95719c7c6d0ea4eb354141531a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <ChrRossmanith@web.de>
Context
- [PATCH] Remove RTL_CONSTASCII_(U)STRINGPARAM (sd) · via Code Review
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.