summaryrefslogtreecommitdiff
path: root/sd/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/core')
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx4
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/core/sdpage.cxx6
-rw-r--r--sd/source/core/stlfamily.cxx4
-rw-r--r--sd/source/core/stlpool.cxx10
6 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 91b0836a9aaf..619b8d216f5b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -471,7 +471,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
else
{
aMissedPresetIds += String(*pEffectNames);
- aMissedPresetIds += String( RTL_CONSTASCII_USTRINGPARAM("\n") );
+ aMissedPresetIds += String( "\n" );
}
#endif
pEffectNames++;
@@ -491,7 +491,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
#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 903998c692f5..e72a1033b9cf 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1667,7 +1667,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
}
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 040413c20f5b..6954913a18a3 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1110,7 +1110,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
// 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 48d5662270f6..6c4faf33d39d 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -561,7 +561,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
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::GetStyleSheetForMasterPageBackground() const
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 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
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 2f140a2d438f..a38791dbd7b5 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -68,7 +68,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
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 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException)
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 ffa64d50b8c2..a64ed0d776df 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -123,7 +123,7 @@ SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle)
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 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
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 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
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::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
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::CreateLayoutSheetNames(const String& rLayoutName, std::ve
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 08:54:41 +0000