diff options
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 33 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 11 | ||||
-rw-r--r-- | framework/source/services/urltransformer.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmodemenucontroller.cxx | 8 | ||||
-rw-r--r-- | framework/source/uifactory/factoryconfiguration.cxx | 5 |
5 files changed, 19 insertions, 42 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 4f33a0c8b76b..6a5ef90cbe19 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -885,10 +885,9 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) OUString aImagesItemNode( aAddonImagesNode + aAddonImagesNodeSeq[n] ); // Create sequence for data access - OUStringBuffer aBuffer( aImagesItemNode ); - aBuffer.append( m_aPathDelimiter ); - aBuffer.append( m_aPropNames[ OFFSET_MENUITEM_URL ] ); - aAddonImageItemNodePropNames[0] = aBuffer.makeStringAndClear(); + aAddonImageItemNodePropNames[0] = aImagesItemNode + + m_aPathDelimiter + + m_aPropNames[ OFFSET_MENUITEM_URL ]; Sequence< Any > aAddonImageItemNodeValues = GetProperties( aAddonImageItemNodePropNames ); @@ -898,11 +897,10 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) !aURL.isEmpty() && !HasAssociatedImages( aURL )) { - OUStringBuffer aBuf( aImagesItemNode ); - aBuf.append( m_aPathDelimiter ); - aBuf.append( IMAGES_NODENAME ); - aBuf.append( m_aPathDelimiter ); - OUString aImagesUserDefinedItemNode = aBuf.makeStringAndClear(); + OUString aImagesUserDefinedItemNode = aImagesItemNode + + m_aPathDelimiter + + IMAGES_NODENAME + + m_aPathDelimiter; // Read a user-defined images data std::unique_ptr<ImageEntry> pImageEntry = ReadImageData( aImagesUserDefinedItemNode ); @@ -1074,10 +1072,8 @@ void AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) { - OUStringBuffer aBuffer( aMergeAddonInstructionBase ); - aBuffer.append( m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] ); - - OUString aMergeToolbarBaseNode = aBuffer.makeStringAndClear(); + OUString aMergeToolbarBaseNode = aMergeAddonInstructionBase + + m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ]; return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems ); } @@ -1158,10 +1154,8 @@ bool AddonsOptions_Impl::ReadMergeNotebookBarData( const OUString& aMergeAddonInstructionBase, Sequence<Sequence<PropertyValue>>& rMergeNotebookBarItems) { - OUStringBuffer aBuffer(aMergeAddonInstructionBase); - aBuffer.append(m_aPropMergeNotebookBarNames[OFFSET_MERGENOTEBOOKBAR_NOTEBOOKBARITEMS]); - - OUString aMergeNotebookBarBaseNode = aBuffer.makeStringAndClear(); + OUString aMergeNotebookBarBaseNode = aMergeAddonInstructionBase + + m_aPropMergeNotebookBarNames[OFFSET_MERGENOTEBOOKBAR_NOTEBOOKBARITEMS]; return ReadNotebookBarItemSet(aMergeNotebookBarBaseNode, rMergeNotebookBarItems); } @@ -1233,9 +1227,8 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData( { sal_uInt32 nStatusbarItemCount = rMergeStatusbarItems.getLength(); - OUStringBuffer aBuffer( aMergeAddonInstructionBase ); - aBuffer.append( m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ] ); - OUString aMergeStatusbarBaseNode = aBuffer.makeStringAndClear(); + OUString aMergeStatusbarBaseNode = aMergeAddonInstructionBase + + m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ]; OUString aAddonStatusbarItemSetNode( aMergeStatusbarBaseNode + m_aPathDelimiter ); Sequence< OUString > aAddonStatusbarItemSetNodeSeq = GetNodeNames( aMergeStatusbarBaseNode ); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 625739ec4cfe..8da37225f2e0 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2001,10 +2001,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn css::uno::Reference< css::container::XNameContainer > xModify(xCheck, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW); - OUStringBuffer sIDBuf; - sIDBuf.append(RECOVERY_ITEM_BASE_IDENTIFIER); - sIDBuf.append(rInfo.ID); - OUString sID = sIDBuf.makeStringAndClear(); + OUString sID = RECOVERY_ITEM_BASE_IDENTIFIER + OUString::number(rInfo.ID); // remove if (bRemoveIt) @@ -4176,11 +4173,7 @@ void AutoRecovery::st_impl_removeLockFile() OUString sUserURL; ::utl::Bootstrap::locateUserInstallation( sUserURL ); - OUStringBuffer sLockURLBuf; - sLockURLBuf.append (sUserURL); - sLockURLBuf.append("/.lock"); - OUString sLockURL = sLockURLBuf.makeStringAndClear(); - + OUString sLockURL = sUserURL + "/.lock"; AutoRecovery::st_impl_removeFile(sLockURL); } catch(const css::uno::Exception&) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index a769790d22c8..ce9ae752ec60 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -261,9 +261,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) else if ( !aURL.Protocol.isEmpty() ) { // Minimal support for unknown protocols - OUStringBuffer aBuffer( aURL.Protocol ); - aBuffer.append( aURL.Path ); - aURL.Complete = aBuffer.makeStringAndClear(); + aURL.Complete = aURL.Protocol + aURL.Path; aURL.Main = aURL.Complete; return true; } diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 9852adf70eee..df76e7d0ced7 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -240,12 +240,10 @@ void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); { - OUStringBuffer aBuf(".uno:Notebookbar?File:string="); - aBuf.append( aCmd ); URL aTargetURL; Sequence<PropertyValue> aArgs; - aTargetURL.Complete = aBuf.makeStringAndClear(); + aTargetURL.Complete = ".uno:Notebookbar?File:string=" + aCmd; xURLTransformer->parseStrict( aTargetURL ); Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); if ( xDispatchProvider.is() ) @@ -261,12 +259,10 @@ void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent } } - OUStringBuffer aBuf(".uno:ToolbarMode?Mode:string="); - aBuf.append( aCmd ); URL aTargetURL; Sequence<PropertyValue> aArgs; - aTargetURL.Complete = aBuf.makeStringAndClear(); + aTargetURL.Complete = ".uno:ToolbarMode?Mode:string=" + aCmd; xURLTransformer->parseStrict( aTargetURL ); Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); if ( xDispatchProvider.is() ) diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index c3a2f964b2e2..97440dd16306 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -47,10 +47,7 @@ namespace framework { static OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName ) { - OUStringBuffer aKey( aCommandURL ); - aKey.append( "-" ); - aKey.append( aModuleName ); - return aKey.makeStringAndClear(); + return aCommandURL + "-" + aModuleName; } // XInterface, XTypeProvider |