diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-16 10:13:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-16 12:12:31 +0200 |
| commit | 4a96fb8ec0130e1036913093836bcf28bc37a49b (patch) | |
| tree | e7aad9be4ca417e9e64f688cc99bee0638037741 /framework | |
| parent | f33b6e341fb7dd1ab3acd4fe5457b716be316e89 (diff) | |
loplugin:bufferadd loosen some constraints
and extend O*StringView to have a constructor that takes a pointer and a
length
Change-Id: I6120e96280f030757e855a6596efdae438b7e1e8
Reviewed-on: https://gerrit.libreoffice.org/80872
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/jobs/helponstartup.cxx | 9 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6 | ||||
| -rw-r--r-- | framework/source/services/desktop.cxx | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 69dc69eacc0d..4233c502d57f 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -334,14 +334,7 @@ OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL, const OUString& sLocale , const OUString& sSystem ) { - OUStringBuffer sHelpURL(256); - sHelpURL.append (sBaseURL ); - sHelpURL.append("?Language="); - sHelpURL.append (sLocale ); - sHelpURL.append("&System=" ); - sHelpURL.append (sSystem ); - - return sHelpURL.makeStringAndClear(); + return sBaseURL + "?Language=" + sLocale + "&System=" + sSystem; } } // namespace framework diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index d0bbafde032c..e5484c7ed4c7 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -974,11 +974,9 @@ void ToolbarLayoutManager::childWindowEvent( VclSimpleEvent const * pEvent ) OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox ); if ( !aToolbarName.isEmpty() ) { - OUStringBuffer aBuf(100); - aBuf.append( "private:resource/toolbar/" ); - aBuf.append( aToolbarName ); + OUString aToolbarUrl = "private:resource/toolbar/" + aToolbarName; - UIElement aToolbar = implts_findToolbar( aBuf.makeStringAndClear() ); + UIElement aToolbar = implts_findToolbar( aToolbarUrl ); if ( aToolbar.m_xUIElement.is() && !aToolbar.m_bFloating ) { implts_setLayoutDirty(); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 1a1352bcf526..c2cf82709ad1 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -116,14 +116,12 @@ void Desktop::constructorInit() InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider ); m_xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); - OUStringBuffer sUntitledPrefix (256); - sUntitledPrefix.append (FwkResId(STR_UNTITLED_DOCUMENT)); - sUntitledPrefix.append (" "); + OUString sUntitledPrefix = FwkResId(STR_UNTITLED_DOCUMENT) + " "; ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection (); m_xTitleNumberGenerator.set(static_cast< ::cppu::OWeakObject* >(pNumbers), css::uno::UNO_QUERY_THROW); pNumbers->setOwner ( static_cast< ::cppu::OWeakObject* >(this) ); - pNumbers->setUntitledPrefix ( sUntitledPrefix.makeStringAndClear () ); + pNumbers->setUntitledPrefix ( sUntitledPrefix ); // Safe impossible cases // We can't work without this helper! |