From e9b75064158a9482d79a123319ad0fe8c497e40a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 31 Aug 2015 08:03:15 +0200 Subject: loplugin:stringconstant: OUStringBuffer: appendAscii -> append Change-Id: Iadb6e16a7aca322a78a82ae1a52f5d085b300efc --- .../accelerators/acceleratorconfiguration.cxx | 8 +- framework/source/fwe/classes/addonsoptions.cxx | 2 +- framework/source/fwe/helper/titlehelper.cxx | 6 +- framework/source/fwi/classes/converter.cxx | 28 +++---- framework/source/helper/persistentwindowstate.cxx | 8 +- framework/source/jobs/helponstartup.cxx | 4 +- .../source/layoutmanager/toolbarlayoutmanager.cxx | 2 +- framework/source/recording/dispatchrecorder.cxx | 90 +++++++++++----------- framework/source/services/autorecovery.cxx | 10 +-- framework/source/services/desktop.cxx | 2 +- framework/source/services/pathsettings.cxx | 10 +-- framework/source/services/substitutepathvars.cxx | 2 +- .../source/uiconfiguration/imagemanagerimpl.cxx | 16 ++-- .../moduleuiconfigurationmanager.cxx | 2 +- .../uiconfiguration/uiconfigurationmanager.cxx | 2 +- .../source/uielement/headermenucontroller.cxx | 14 ++-- .../source/uifactory/factoryconfiguration.cxx | 2 +- .../source/uifactory/uielementfactorymanager.cxx | 4 +- .../source/xml/acceleratorconfigurationreader.cxx | 8 +- framework/source/xml/imagesdocumenthandler.cxx | 8 +- 20 files changed, 114 insertions(+), 114 deletions(-) diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 31892d1e6b63..6a37c39d6128 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -63,13 +63,13 @@ namespace framework OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex)); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT ) - sKeyBuffer.appendAscii("_SHIFT"); + sKeyBuffer.append("_SHIFT"); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 ) - sKeyBuffer.appendAscii("_MOD1"); + sKeyBuffer.append("_MOD1"); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 ) - sKeyBuffer.appendAscii("_MOD2"); + sKeyBuffer.append("_MOD2"); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 ) - sKeyBuffer.appendAscii("_MOD3"); + sKeyBuffer.append("_MOD3"); return sKeyBuffer.makeStringAndClear(); } diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 1f3b074e0b07..26e829bf299e 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1339,7 +1339,7 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS { OUStringBuffer aFileURL( aImageURL ); aFileURL.appendAscii( aExtArray[i] ); - aFileURL.appendAscii( ".bmp" ); + aFileURL.append( ".bmp" ); aImageEntry.addImage( !i ? IMGSIZE_SMALL : IMGSIZE_BIG, Image(), aFileURL.makeStringAndClear() ); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 64d547ee4fd6..8b01a4c80803 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -359,7 +359,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram if (nLeasedNumber != css::frame::UntitledNumbersConst::INVALID_NUMBER) sNewTitle.append ((::sal_Int32)nLeasedNumber); else - sNewTitle.appendAscii("?"); + sNewTitle.append("?"); sTitle = sNewTitle.makeStringAndClear (); } @@ -419,7 +419,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: sTitle.append (xModelTitle->getTitle ()); if ( nLeasedNumber > 1 ) { - sTitle.appendAscii (" : "); + sTitle.append (" : "); sTitle.append ((::sal_Int32)nLeasedNumber); } if (xModel.is ()) @@ -547,7 +547,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) // So please add it to the title in case it does really exists only. if (!sUIName.isEmpty()) { - sTitle.appendAscii (" " ); + sTitle.append (" " ); sTitle.append (sUIName); } } diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 4dfe07028fbe..5028c341c824 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -67,44 +67,44 @@ OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) // write year formatted as "YYYY" if (nYear<10) - sBuffer.appendAscii("000"); + sBuffer.append("000"); else if (nYear<100) - sBuffer.appendAscii("00"); + sBuffer.append("00"); else if (nYear<1000) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nYear ); - sBuffer.appendAscii("-"); + sBuffer.append("-"); // write month formatted as "MM" if (nMonth<10) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nMonth ); - sBuffer.appendAscii("-"); + sBuffer.append("-"); // write day formatted as "DD" if (nDay<10) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nDay ); - sBuffer.appendAscii("T"); + sBuffer.append("T"); // write hours formatted as "hh" if (nHour<10) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nHour ); - sBuffer.appendAscii(":"); + sBuffer.append(":"); // write min formatted as "mm" if (nMin<10) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nMin ); - sBuffer.appendAscii(":"); + sBuffer.append(":"); // write sec formatted as "ss" if (nSec<10) - sBuffer.appendAscii("0"); + sBuffer.append("0"); sBuffer.append( (sal_Int32)nSec ); - sBuffer.appendAscii("Z"); + sBuffer.append("Z"); return sBuffer.makeStringAndClear(); } diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 7724107ea230..565aaabaf7ed 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -169,9 +169,9 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno:: OUString sWindowState; OUStringBuffer sRelPathBuf(256); - sRelPathBuf.appendAscii("Office/Factories/*[\""); + sRelPathBuf.append("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); - sRelPathBuf.appendAscii("\"]" ); + sRelPathBuf.append("\"]" ); OUString sPackage("org.openoffice.Setup/"); OUString sRelPath = sRelPathBuf.makeStringAndClear(); @@ -198,9 +198,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere const OUString& sWindowState) { OUStringBuffer sRelPathBuf(256); - sRelPathBuf.appendAscii("Office/Factories/*[\""); + sRelPathBuf.append("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); - sRelPathBuf.appendAscii("\"]" ); + sRelPathBuf.append("\"]" ); OUString sPackage("org.openoffice.Setup/"); OUString sRelPath = sRelPathBuf.makeStringAndClear(); diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 198af2d038af..9684810c530b 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -342,9 +342,9 @@ OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL, { OUStringBuffer sHelpURL(256); sHelpURL.append (sBaseURL ); - sHelpURL.appendAscii("?Language="); + sHelpURL.append("?Language="); sHelpURL.append (sLocale ); - sHelpURL.appendAscii("&System=" ); + sHelpURL.append("&System=" ); sHelpURL.append (sSystem ); return sHelpURL.makeStringAndClear(); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 041339ecc282..9e719b8c33d4 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -973,7 +973,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) if ( !aToolbarName.isEmpty() ) { OUStringBuffer aBuf(100); - aBuf.appendAscii( "private:resource/toolbar/" ); + aBuf.append( "private:resource/toolbar/" ); aBuf.append( aToolbarName ); UIElement aToolbar = implts_findToolbar( aBuf.makeStringAndClear() ); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index e49d43f3d61b..927c335f187b 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -141,14 +141,14 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE aScriptBuffer.ensureCapacity(10000); m_nRecordingID = 1; - aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); - aScriptBuffer.appendAscii("rem define variables\n"); - aScriptBuffer.appendAscii("dim document as object\n"); - aScriptBuffer.appendAscii("dim dispatcher as object\n"); - aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); - aScriptBuffer.appendAscii("rem get access to the document\n"); - aScriptBuffer.appendAscii("document = ThisComponent.CurrentController.Frame\n"); - aScriptBuffer.appendAscii("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n"); + aScriptBuffer.append("rem ----------------------------------------------------------------------\n"); + aScriptBuffer.append("rem define variables\n"); + aScriptBuffer.append("dim document as object\n"); + aScriptBuffer.append("dim dispatcher as object\n"); + aScriptBuffer.append("rem ----------------------------------------------------------------------\n"); + aScriptBuffer.append("rem get access to the document\n"); + aScriptBuffer.append("document = ThisComponent.CurrentController.Frame\n"); + aScriptBuffer.append("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n"); std::vector< com::sun::star::frame::DispatchStatement>::iterator p; for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p ) @@ -164,16 +164,16 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu { // structs are recorded as arrays, convert to "Sequence of any" Sequence< Any > aSeq = make_seq_out_of_struct( aValue ); - aArgumentBuffer.appendAscii("Array("); + aArgumentBuffer.append("Array("); for ( sal_Int32 nAny=0; nAny>= aSeq; - aArgumentBuffer.appendAscii("Array("); + aArgumentBuffer.append("Array("); for ( sal_Int32 nAny=0; nAny0 ) // if this is not the first character, parts of the string have already been added - aArgumentBuffer.appendAscii("+"); + aArgumentBuffer.append("+"); // add the character constant - aArgumentBuffer.appendAscii("CHR$("); + aArgumentBuffer.append("CHR$("); aArgumentBuffer.append( (sal_Int32) pChars[nChar] ); - aArgumentBuffer.appendAscii(")"); + aArgumentBuffer.append(")"); } else { @@ -233,10 +233,10 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu { if ( nChar>0 ) // if this is not the first character, parts of the string have already been added - aArgumentBuffer.appendAscii("+"); + aArgumentBuffer.append("+"); // start a new string - aArgumentBuffer.appendAscii("\""); + aArgumentBuffer.append("\""); bInString = true; } @@ -246,21 +246,21 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu // close string if ( bInString ) - aArgumentBuffer.appendAscii("\""); + aArgumentBuffer.append("\""); } else - aArgumentBuffer.appendAscii("\"\""); + aArgumentBuffer.append("\"\""); } else if (aValue.getValueType() == cppu::UnoType::get()) { // character variables are recorded as strings, back conversion must be handled in client code sal_Unicode nVal = *static_cast(aValue.getValue()); - aArgumentBuffer.appendAscii("\""); + aArgumentBuffer.append("\""); if ( (sal_Unicode(nVal) == '\"') ) // encode \" to \"\" aArgumentBuffer.append((sal_Unicode)nVal); aArgumentBuffer.append((sal_Unicode)nVal); - aArgumentBuffer.appendAscii("\""); + aArgumentBuffer.append("\""); } else { @@ -278,7 +278,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu { OUString aName = aValue.getValueType().getTypeName(); aArgumentBuffer.append( aName ); - aArgumentBuffer.appendAscii("."); + aArgumentBuffer.append("."); } aArgumentBuffer.append(sVal); @@ -294,7 +294,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, // this value is used to name the arrays of aArgumentBuffer sArrayName = "args" + OUString::number(m_nRecordingID); - aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); + aScriptBuffer.append("rem ----------------------------------------------------------------------\n"); sal_Int32 nLength = lArguments.getLength(); sal_Int32 nValidArgs = 0; @@ -318,23 +318,23 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, { // add arg().Name if(bAsComment) - aArgumentBuffer.appendAscii(REM_AS_COMMENT); + aArgumentBuffer.append(REM_AS_COMMENT); aArgumentBuffer.append (sArrayName); - aArgumentBuffer.appendAscii("("); + aArgumentBuffer.append("("); aArgumentBuffer.append (nValidArgs); - aArgumentBuffer.appendAscii(").Name = \""); + aArgumentBuffer.append(").Name = \""); aArgumentBuffer.append (lArguments[i].Name); - aArgumentBuffer.appendAscii("\"\n"); + aArgumentBuffer.append("\"\n"); // add arg().Value if(bAsComment) - aArgumentBuffer.appendAscii(REM_AS_COMMENT); + aArgumentBuffer.append(REM_AS_COMMENT); aArgumentBuffer.append (sArrayName); - aArgumentBuffer.appendAscii("("); + aArgumentBuffer.append("("); aArgumentBuffer.append (nValidArgs); - aArgumentBuffer.appendAscii(").Value = "); + aArgumentBuffer.append(").Value = "); aArgumentBuffer.append (sValBuffer.makeStringAndClear()); - aArgumentBuffer.appendAscii("\n"); + aArgumentBuffer.append("\n"); ++nValidArgs; } @@ -344,30 +344,30 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, if(nValidArgs>0) { if(bAsComment) - aScriptBuffer.appendAscii(REM_AS_COMMENT); - aScriptBuffer.appendAscii("dim "); + aScriptBuffer.append(REM_AS_COMMENT); + aScriptBuffer.append("dim "); aScriptBuffer.append (sArrayName); - aScriptBuffer.appendAscii("("); + aScriptBuffer.append("("); aScriptBuffer.append ((sal_Int32)(nValidArgs-1)); // 0 based! - aScriptBuffer.appendAscii(") as new com.sun.star.beans.PropertyValue\n"); + aScriptBuffer.append(") as new com.sun.star.beans.PropertyValue\n"); aScriptBuffer.append (aArgumentBuffer.makeStringAndClear()); - aScriptBuffer.appendAscii("\n"); + aScriptBuffer.append("\n"); } // add code for dispatches if(bAsComment) - aScriptBuffer.appendAscii(REM_AS_COMMENT); - aScriptBuffer.appendAscii("dispatcher.executeDispatch(document, \""); + aScriptBuffer.append(REM_AS_COMMENT); + aScriptBuffer.append("dispatcher.executeDispatch(document, \""); aScriptBuffer.append (aURL); - aScriptBuffer.appendAscii("\", \"\", 0, "); + aScriptBuffer.append("\", \"\", 0, "); if(nValidArgs<1) - aScriptBuffer.appendAscii("Array()"); + aScriptBuffer.append("Array()"); else { aScriptBuffer.append( sArrayName.getStr() ); - aScriptBuffer.appendAscii("()"); + aScriptBuffer.append("()"); } - aScriptBuffer.appendAscii(")\n\n"); + aScriptBuffer.append(")\n\n"); /* SAFE { */ m_nRecordingID++; diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 1b0033f81f5a..531c443d8ba1 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3507,9 +3507,9 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL , // re-throw OUStringBuffer sMsg(256); - sMsg.appendAscii("Recovery of \""); + sMsg.append("Recovery of \""); sMsg.append (sURL ); - sMsg.appendAscii("\" failed." ); + sMsg.append("\" failed." ); throw css::lang::WrappedTargetException( sMsg.makeStringAndClear(), @@ -3541,8 +3541,8 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack sUniqueName.append(aURL.Name); } else if (!rInfo.FactoryURL.isEmpty()) - sUniqueName.appendAscii("untitled"); - sUniqueName.appendAscii("_"); + sUniqueName.append("untitled"); + sUniqueName.append("_"); // TODO: Must we strip some illegal signes - if we use the title? @@ -4355,7 +4355,7 @@ void AutoRecovery::st_impl_removeLockFile() OUStringBuffer sLockURLBuf; sLockURLBuf.append (sUserURL); - sLockURLBuf.appendAscii("/.lock"); + sLockURLBuf.append("/.lock"); OUString sLockURL = sLockURLBuf.makeStringAndClear(); AutoRecovery::st_impl_removeFile(sLockURL); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 9c2eb1c02e79..82f24c77a9f3 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -112,7 +112,7 @@ void Desktop::constructorInit() OUStringBuffer sUntitledPrefix (256); sUntitledPrefix.append (FWK_RESSTR(STR_UNTITLED_DOCUMENT)); - sUntitledPrefix.appendAscii (" "); + sUntitledPrefix.append (" "); ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection (); m_xTitleNumberGenerator = css::uno::Reference< css::frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pNumbers), css::uno::UNO_QUERY_THROW); diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 5296c8fde73e..82c85aa7667d 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1023,7 +1023,7 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r sPathVal.append(*pIt); ++pIt; if (pIt != lTemp.end()) - sPathVal.appendAscii(";"); + sPathVal.append(";"); } return sPathVal.makeStringAndClear(); @@ -1244,9 +1244,9 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , if (aChangePath.bIsSinglePath) { OUStringBuffer sMsg(256); - sMsg.appendAscii("The path '" ); + sMsg.append("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); + sMsg.append("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1265,9 +1265,9 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , if (aChangePath.bIsSinglePath) { OUStringBuffer sMsg(256); - sMsg.appendAscii("The path '" ); + sMsg.append("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); + sMsg.append("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ad75eee41d14..65ff79d9ed77 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -844,7 +844,7 @@ OUString SubstitutePathVariables::GetPathVariableValue() const { osl::FileBase::getFileURLFromSystemPath( sToken, aTmp ); if ( bAppendSep ) - aPathStrBuffer.appendAscii( ";" ); // Office uses ';' as path separator + aPathStrBuffer.append( ";" ); // Office uses ';' as path separator aPathStrBuffer.append( aTmp ); bAppendSep = true; } diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index f102b87d7618..f3013ddc8bb1 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -131,15 +131,15 @@ static OUString getCanonicalName( const OUString& rFileName ) { // map forbidden characters to escape case '/' : if ( !bRemoveSlash ) - aBuf.appendAscii( "%2f" ); + aBuf.append( "%2f" ); break; - case '\\': aBuf.appendAscii( "%5c" ); bRemoveSlash = false; break; - case ':' : aBuf.appendAscii( "%3a" ); bRemoveSlash = false; break; - case '*' : aBuf.appendAscii( "%2a" ); bRemoveSlash = false; break; - case '?' : aBuf.appendAscii( "%3f" ); bRemoveSlash = false; break; - case '<' : aBuf.appendAscii( "%3c" ); bRemoveSlash = false; break; - case '>' : aBuf.appendAscii( "%3e" ); bRemoveSlash = false; break; - case '|' : aBuf.appendAscii( "%7c" ); bRemoveSlash = false; break; + case '\\': aBuf.append( "%5c" ); bRemoveSlash = false; break; + case ':' : aBuf.append( "%3a" ); bRemoveSlash = false; break; + case '*' : aBuf.append( "%2a" ); bRemoveSlash = false; break; + case '?' : aBuf.append( "%3f" ); bRemoveSlash = false; break; + case '<' : aBuf.append( "%3c" ); bRemoveSlash = false; break; + case '>' : aBuf.append( "%3e" ); bRemoveSlash = false; break; + case '|' : aBuf.append( "%7c" ); bRemoveSlash = false; break; default: aBuf.append( c ); bRemoveSlash = false; } } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 62325ad3a6ce..844b55726934 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -368,7 +368,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); aBuf.appendAscii( RESOURCEURL_PREFIX ); aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] ); - aBuf.appendAscii( "/" ); + aBuf.append( "/" ); OUString aResURLPrefix( aBuf.makeStringAndClear() ); UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 8c79778f00aa..6f68a3100a73 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -291,7 +291,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); aBuf.appendAscii( RESOURCEURL_PREFIX ); aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] ); - aBuf.appendAscii( "/" ); + aBuf.append( "/" ); OUString aResURLPrefix( aBuf.makeStringAndClear() ); UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap; diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 0c57b6691164..757515577b7e 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -126,13 +126,13 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; OUStringBuffer aStrBuf( aCmd ); - aStrBuf.appendAscii( "?PageStyle:string="); + aStrBuf.append( "?PageStyle:string="); aStrBuf.append( aDisplayName ); - aStrBuf.appendAscii( "&On:bool=" ); + aStrBuf.append( "&On:bool=" ); if ( !bHeaderIsOn ) - aStrBuf.appendAscii( "true" ); + aStrBuf.append( "true" ); else - aStrBuf.appendAscii( "false" ); + aStrBuf.append( "false" ); OUString aCommand( aStrBuf.makeStringAndClear() ); pVCLPopupMenu->InsertItem( nId, aDisplayName, MenuItemBits::CHECKABLE ); if ( !bFirstItemInserted ) @@ -162,13 +162,13 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, FwlResId(STR_MENU_HEADFOOTALL).toString(), MenuItemBits::NONE, OString(), 0 ); OUStringBuffer aStrBuf( aCmd ); - aStrBuf.appendAscii( "?On:bool=" ); + aStrBuf.append( "?On:bool=" ); // Command depends on check state of first menu item entry if ( !bFirstChecked ) - aStrBuf.appendAscii( "true" ); + aStrBuf.append( "true" ); else - aStrBuf.appendAscii( "false" ); + aStrBuf.append( "false" ); pVCLPopupMenu->SetItemCommand( 1, aStrBuf.makeStringAndClear() ); pVCLPopupMenu->InsertSeparator(OString(), 1); diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index ca432e11e303..2a7da9943082 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -47,7 +47,7 @@ namespace framework OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName ) { OUStringBuffer aKey( aCommandURL ); - aKey.appendAscii( "-" ); + aKey.append( "-" ); aKey.append( aModuleName ); return aKey.makeStringAndClear(); } diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index e4dc53875c61..034feecc5355 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -57,9 +57,9 @@ namespace framework static OUString getHashKeyFromStrings( const OUString& aType, const OUString& aName, const OUString& aModuleName ) { OUStringBuffer aKey( aType ); - aKey.appendAscii( "^" ); + aKey.append( "^" ); aKey.append( aName ); - aKey.appendAscii( "^" ); + aKey.append( "^" ); aKey.append( aModuleName ); return aKey.makeStringAndClear(); } diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 7e768f98da37..000e831d6045 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -46,7 +46,7 @@ namespace framework{ { \ OUStringBuffer sMessage(256); \ sMessage.append (implts_getErrorLineString()); \ - sMessage.appendAscii(COMMENT ); \ + sMessage.append(COMMENT ); \ \ throw css::xml::sax::SAXException( \ sMessage.makeStringAndClear(), \ @@ -273,11 +273,11 @@ OUString AcceleratorConfigurationReader::implts_getErrorLineString() return OUString("Error during parsing XML. (No further info available ...)"); OUStringBuffer sMsg(256); - sMsg.appendAscii("Error during parsing XML in\nline = "); + sMsg.append("Error during parsing XML in\nline = "); sMsg.append (m_xLocator->getLineNumber() ); - sMsg.appendAscii("\ncolumn = " ); + sMsg.append("\ncolumn = " ); sMsg.append (m_xLocator->getColumnNumber() ); - sMsg.appendAscii("." ); + sMsg.append("." ); return sMsg.makeStringAndClear(); } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index aab2c4c64f37..f2a86863e25a 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -115,11 +115,11 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI OUStringBuffer temp( 20 ); if ( ImagesEntries[i].nNamespace == IMG_NS_IMAGE ) - temp.appendAscii( XMLNS_IMAGE ); + temp.append( XMLNS_IMAGE ); else - temp.appendAscii( XMLNS_XLINK ); + temp.append( XMLNS_XLINK ); - temp.appendAscii( XMLNS_FILTER_SEPARATOR ); + temp.append( XMLNS_FILTER_SEPARATOR ); temp.appendAscii( ImagesEntries[i].aEntryName ); m_aImageMap.insert( ImageHashMap::value_type( temp.makeStringAndClear(), (Image_XML_Entry)i ) ); } @@ -703,7 +703,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* OUStringBuffer aColorStrBuffer( 8 ); sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); - aColorStrBuffer.appendAscii( "#" ); + aColorStrBuffer.append( "#" ); aColorStrBuffer.append( OUString::number( nValue, 16 )); pList->AddAttribute( m_aXMLImageNS + ATTRIBUTE_MASKCOLOR, -- cgit