Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4170
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/4170/1
Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)
Change-Id: Ie936ffa0ca8e97893251ef99784a257815526957
---
M sd/source/ui/slideshow/showwin.cxx
M sd/source/ui/unoidl/sddetect.cxx
M sd/source/ui/unoidl/unomodel.cxx
M sd/source/ui/unoidl/unopage.cxx
M sd/source/ui/view/DocumentRenderer.cxx
M sd/source/ui/view/ViewClipboard.cxx
M sd/source/ui/view/drawview.cxx
M sd/source/ui/view/outlnvsh.cxx
M sd/source/ui/view/unmodpg.cxx
M sd/source/ui/view/viewshel.cxx
10 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 81b624d..e3f34b1 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -555,9 +555,9 @@
SvtSysLocale aSysLocale;
const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData();
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " ));
+ aText.AppendAscii( " ( " );
aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) );
- aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" ));
+ aText.AppendAscii( " )" );
aVDev.DrawText( Point( aOffset.Width(), 0 ), aText );
DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize,
aVDev );
bDrawn = true;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index b598093..ac1f7d9 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -141,7 +141,7 @@
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
}
- else if( !aURL.Len() &&
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) )
+ else if( !aURL.Len() && lDescriptor[nProperty].Name == "FileName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4d4746e..62c6d00 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -821,59 +821,59 @@
if( NULL == mpDoc )
throw lang::DisposedException();
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.DashTable" ) )
{
if( !mxDashTable.is() )
mxDashTable = SvxUnoDashTable_createInstance( mpDoc );
return mxDashTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GradientTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.GradientTable" ) )
{
if( !mxGradientTable.is() )
mxGradientTable = SvxUnoGradientTable_createInstance( mpDoc );
return mxGradientTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.HatchTable" ) )
{
if( !mxHatchTable.is() )
mxHatchTable = SvxUnoHatchTable_createInstance( mpDoc );
return mxHatchTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.BitmapTable" ) )
{
if( !mxBitmapTable.is() )
mxBitmapTable = SvxUnoBitmapTable_createInstance( mpDoc );
return mxBitmapTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.TransparencyGradientTable"
) )
{
if( !mxTransGradientTable.is() )
mxTransGradientTable = SvxUnoTransGradientTable_createInstance( mpDoc );
return mxTransGradientTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.MarkerTable" ) )
{
if( !mxMarkerTable.is() )
mxMarkerTable = SvxUnoMarkerTable_createInstance( mpDoc );
return mxMarkerTable;
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.NumberingRules" ) ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.text.NumberingRules" ) )
{
return uno::Reference< uno::XInterface >( SvxCreateNumRule( mpDoc ), uno::UNO_QUERY );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Background" ) ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.Background" ) )
{
return uno::Reference< uno::XInterface >(
static_cast<uno::XWeak*>(new SdUnoPageBackground( mpDoc )));
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Defaults") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.Defaults" ) )
{
if( !mxDrawingPool.is() )
mxDrawingPool = SdUnoCreatePool( mpDoc );
@@ -897,38 +897,38 @@
return SvUnoImageMapPolygonObject_createInstance( ImplGetSupportedMacroItems() );
}
- if( ( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.Settings") ) ) ||
- ( !mbImpressDoc && ( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DocumentSettings") ) ) ) ||
- ( mbImpressDoc && ( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.DocumentSettings") ) ) ) )
+ if( ( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.document.Settings" ) ) ||
+ ( !mbImpressDoc && ( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.drawing.DocumentSettings" ) ) ) ||
+ ( mbImpressDoc && ( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.presentation.DocumentSettings" ) ) ) )
{
return sd::DocumentSettings_createInstance( this );
}
- if( ( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime") ) ) ||
- ( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.textfield.DateTime") ) ) )
+ if( ( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.text.TextField.DateTime" ) ) ||
+ ( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.text.textfield.DateTime" ) ) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::DATE );
}
- if( (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Header"))) ||
- (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.Header"))) )
+ if( (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.TextField.Header")) ||
+ (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.textfield.Header")) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField(
text::textfield::Type::PRESENTATION_HEADER );
}
- if( (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Footer"))) ||
- (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.Footer"))) )
+ if( (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.TextField.Footer")) ||
+ (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.textfield.Footer")) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField(
text::textfield::Type::PRESENTATION_FOOTER );
}
- if( (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.DateTime"))) ||
- (0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.DateTime"))) )
+ if( (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.TextField.DateTime"))
||
+ (0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.presentation.textfield.DateTime"))
)
{
return (::cppu::OWeakObject * )new SvxUnoTextField(
text::textfield::Type::PRESENTATION_DATE_TIME );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.xml.NamespaceMap") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo( "com.sun.star.xml.NamespaceMap" ) )
{
static sal_uInt16 aWhichIds[] = { SDRATTR_XMLATTRIBUTES, EE_CHAR_XMLATTRIBS,
EE_PARA_XMLATTRIBS, 0 };
@@ -936,17 +936,17 @@
}
// Support creation of GraphicObjectResolver and EmbeddedObjectResolver
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.document.ExportGraphicObjectResolver" ) )
{
return (::cppu::OWeakObject * )new SvXMLGraphicHelper( GRAPHICHELPER_MODE_WRITE );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.document.ImportGraphicObjectResolver" ) )
{
return (::cppu::OWeakObject * )new SvXMLGraphicHelper( GRAPHICHELPER_MODE_READ );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.document.ExportEmbeddedObjectResolver" ) )
{
::comphelper::IEmbeddedHelper *pPersist = mpDoc ? mpDoc->GetPersist() : NULL;
if( NULL == pPersist )
@@ -955,7 +955,7 @@
return (::cppu::OWeakObject * )new SvXMLEmbeddedObjectHelper( *pPersist,
EMBEDDEDOBJECTHELPER_MODE_WRITE );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver") ) )
+ if( 0 == aServiceSpecifier.reverseCompareTo(
"com.sun.star.document.ImportEmbeddedObjectResolver" ) )
{
::comphelper::IEmbeddedHelper *pPersist = mpDoc ? mpDoc->GetPersist() : NULL;
if( NULL == pPersist )
@@ -1589,7 +1589,7 @@
vcl::PDFNote aNote;
String sTitle( xAnnotation->getAuthor() );
- sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+ sTitle.AppendAscii( ", " );
sTitle += aStr;
aNote.Title = sTitle;
aNote.Contents = xText->getString();
@@ -2705,7 +2705,7 @@
} while( !bUnique );
String aLayoutName( aPrefix );
- aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aLayoutName.AppendAscii( SD_LT_SEPARATOR );
aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
// create styles
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 94aac3c..12926e2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -401,7 +401,7 @@
return NULL;
String aType( xShape->getShapeType() );
- const String aPrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.") );
+ const String aPrefix( "com.sun.star.presentation." );
if( aType.CompareTo( aPrefix, aPrefix.Len() ) != 0 )
{
SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape );
@@ -2166,7 +2166,7 @@
if( rUIName.Equals( aDefPageName, 0, aDefPageName.Len() ) )
{
- aApiName = OUString( RTL_CONSTASCII_USTRINGPARAM( sEmptyPageName ) );
+ aApiName = OUString( sEmptyPageName );
aApiName += rUIName.Copy( aDefPageName.Len() );
}
else
@@ -2184,7 +2184,7 @@
String getUiNameFromPageApiNameImpl( const OUString& rApiName )
{
- const String aDefPageName(RTL_CONSTASCII_USTRINGPARAM( sEmptyPageName ));
+ const String aDefPageName( sEmptyPageName );
if( rApiName.compareTo( aDefPageName, aDefPageName.Len() ) == 0 )
{
OUString aNumber( rApiName.copy( sizeof( sEmptyPageName ) - 1 ) );
@@ -2933,7 +2933,7 @@
if(pSSPool)
{
String aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage
)->GetLayoutName() );
-
aLayoutName.Erase(aLayoutName.Search(String(RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR)))+4);
+ aLayoutName.Erase(aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName,
SD_STYLE_FAMILY_MASTERPAGE );
@@ -2977,7 +2977,7 @@
if(pSSPool)
{
String aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName()
);
- aLayoutName.Erase(
aLayoutName.Search(String(RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR)))+4);
+ aLayoutName.Erase( aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName,
SD_STYLE_FAMILY_MASTERPAGE );
@@ -3069,7 +3069,7 @@
if(SvxFmDrawPage::mpPage)
{
String aLayoutName( GetPage()->GetLayoutName() );
- aLayoutName = aLayoutName.Erase(aLayoutName.Search( String(
RTL_CONSTASCII_USTRINGPARAM((SD_LT_SEPARATOR)))));
+ aLayoutName = aLayoutName.Erase(aLayoutName.Search( String(SD_LT_SEPARATOR)));
return aLayoutName;
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index a544515..a277534 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -405,7 +405,7 @@
SvtModuleOptions aOpt;
String aAppGroupname( String( SdResId( _STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) );
- aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
+ aAppGroupname.SearchAndReplace( String( "%s" ),
aOpt.GetModuleName( mbImpress ?
SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2",
aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 867fa2a..4b2691d 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -154,7 +154,7 @@
// We have to remove the layout suffix from the layout name which is
// appended again by SetMasterPage() to the given name. Don't ask.
- String sLayoutSuffix (RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR));
+ String sLayoutSuffix (SD_LT_SEPARATOR);
sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE));
sal_uInt16 nLength = sLayoutSuffix.Len();
String sLayoutName (pMasterPage->GetLayoutName());
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index bd8424b..6b80bc5 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -547,7 +547,7 @@
if( pUndoManager )
{
String aUndo( SVX_RES(STR_EditDelete) );
- String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
+ String aSearchString("%1");
aUndo.SearchAndReplace(aSearchString, GetDescriptionOfMarkedObjects());
pUndoManager->EnterListAction(aUndo, aUndo);
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 80f8b3d..fc6f30f 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1378,7 +1378,7 @@
aPageStr = String(SdResId( STR_SD_PAGE ));
aPageStr += sal_Unicode(' ');
aPageStr += OUString::number( (sal_Int32)(nPos + 1) ); // sal_uLong -> sal_Int32
- aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
+ aPageStr.AppendAscii( " / " );
aPageStr += OUString::number( nPageCount );
aLayoutStr = pPage->GetLayoutName();
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 068c284..f47ec21 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -190,7 +190,7 @@
void RenameLayoutTemplateUndoAction::Undo()
{
String aLayoutName( maNewName );
- aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aLayoutName.AppendAscii( SD_LT_SEPARATOR );
aLayoutName.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ;
mpDoc->RenameLayoutTemplate( aLayoutName, maOldName );
@@ -199,7 +199,7 @@
void RenameLayoutTemplateUndoAction::Redo()
{
String aLayoutName( maOldName );
- aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
+ aLayoutName.AppendAscii( SD_LT_SEPARATOR );
aLayoutName.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ;
mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 19ab220..b60d6ff 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -789,7 +789,7 @@
{
SfxStyleSheetBasePool* pSSPool = mpView->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);
--
To view, visit https://gerrit.libreoffice.org/4170
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie936ffa0ca8e97893251ef99784a257815526957
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.