diff options
author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-05-30 22:22:11 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-05-31 07:25:26 +0000 |
commit | 5b26722ace02f71c79573b3795b2bf7b9412090f (patch) | |
tree | 94db6eb75e6a1da5d6e83cf77eba7d3fc5e7cc08 | |
parent | 287d483edb0359aa52238e75750f61a75f532436 (diff) |
Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)
Change-Id: I179208d5ffe94e95719c7c6d0ea4eb354141531a
Reviewed-on: https://gerrit.libreoffice.org/4107
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
28 files changed, 102 insertions, 110 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); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index e96a03f44636..94ceab4bb785 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -926,9 +926,9 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 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 3f7daf14f5af..9e0c36acd227 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -177,7 +177,7 @@ void ButtonSetImpl::scanForButtonSets( const OUString& rPath ) 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 bc5891b64924..5d636b532170 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -338,14 +338,14 @@ static String getParagraphStyle( SdrOutliner* pOutliner, sal_Int32 nPara ) { 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 @@ bool HtmlExport::CreateOutlinePages() 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 @@ void HtmlExport::CreateFileNames() 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 @@ void HtmlExport::CreateFileNames() 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 @@ void HtmlExport::CreateFileNames() 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 @@ static const char * JS_CollapseOutline = 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 @@ bool HtmlExport::CreateFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ bool HtmlExport::CreateNavBarFrames() 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 @@ String HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const 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 @@ bool HtmlExport::CreateBitmaps() // ===================================================================== String HtmlExport::CreateBodyTag() const { - String aStr( RTL_CONSTASCII_USTRINGPARAM("<body") ); + String aStr( "<body" ); if( mbUserAttr || mbDocColors ) { @@ -2677,7 +2676,7 @@ String HtmlExport::CreateLink( const String& aLink, 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 @@ String HtmlExport::CreateImage( const String& aImage, const String& aAltText, 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::CreateImage( const String& aImage, const String& aAltText, 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 @@ String HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, 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::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPoly 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 @@ String HtmlExport::CreatePageURL( sal_uInt16 nPgNum ) { 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 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S } - 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 @@ bool HtmlExport::CreateASPScripts() 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 @@ bool HtmlExport::CreateImageFileList() 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::CreateImageFileList() 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 @@ String HtmlExport::InsertSound( const String& rSoundFile ) 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 fd66e79e0688..6afdf370048c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -616,7 +616,7 @@ sal_Bool ImplSdPPTImport::Import() 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 cab013acb118..554fff5e4a63 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -268,8 +268,7 @@ sal_Int32 ReadThroughComponent( 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 @@ sal_Int32 ReadThroughComponent( 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 @@ sal_Int32 ReadThroughComponent( 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 @@ sal_Int32 ReadThroughComponent( 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 @@ sal_Int32 ReadThroughComponent( 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 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) { 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 @@ sal_Bool SdXMLFilter::Export() 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 8b8f78a0b08e..83291d189c74 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -203,9 +203,9 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, } 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 5b18349a0f1e..77c1acb773a1 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -274,10 +274,10 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) // 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 069dd4213b3a..46d112901767 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -52,7 +52,7 @@ SdPagesField::SdPagesField( Window* pParent, 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 787d9f3c9a83..0b362ca942e4 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -991,7 +991,7 @@ String AssistentDlgImpl::GetDocFileName() { aDocFile = pEntry->msPath; - aTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); + aTitle.AppendAscii( " (" ); aTitle.Append( pEntry->msTitle ); aTitle.Append( sal_Unicode(')') ); } @@ -1438,7 +1438,7 @@ void AssistentDlgImpl::UpdateUserData() { 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 b0ab85b32394..36826713d2c6 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -98,7 +98,7 @@ OutlineBulletDlg::OutlineBulletDlg( { 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 9fce09b1e878..fa638597fb18 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -172,7 +172,7 @@ void SdStartPresentationDlg::InitMonitorSettings() 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 37e7954ce3f3..ff8f9a9554d1 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -97,7 +97,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, 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 68315604a326..489ab81e6b89 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -55,7 +55,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, 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 f5cf9202b492..e5bdf296b0ce 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -886,7 +886,7 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV { // 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 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV { // 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 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV { // 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 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV { // 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 5bbf4e24c226..6d64c9821d2b 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -350,7 +350,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u { 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 ab551c2802db..61a223d7a267 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -416,7 +416,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) 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 04d0009967c2..c2f8350c3f2b 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -40,7 +40,7 @@ CustomAnimationPanel::CustomAnimationPanel ( 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 ef6ae63b2a7c..0e4b23497f0f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -152,7 +152,7 @@ LayoutMenu::LayoutMenu ( 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 350eb8852345..0c04e97a0363 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -34,7 +34,7 @@ PanelBase::PanelBase ( 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 2b457819b28f..53fbe580219e 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -44,7 +44,7 @@ using namespace cssu; 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 @@ Reference<XInterface> SAL_CALL PanelFactory_createInstance ( ::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 3b4d994d207b..79b2ae2bc831 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -38,7 +38,7 @@ SlideTransitionPanel::SlideTransitionPanel ( : 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 28ceb65cfbbd..a8634a4b1f00 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -36,7 +36,7 @@ TableDesignPanel::TableDesignPanel ( : PanelBase(pParentWindow, rViewShellBase) { #ifdef DEBUG - SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sd:TableDesignPanel"))); + SetText(OUString("sd:TableDesignPanel")); #endif } |