diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-30 16:38:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 08:56:20 +0000 |
commit | 1c3e84d8192218befebcddae2ed9842d081dc6c7 (patch) | |
tree | f4fc5cddd181d6d49bf55f74e6d3d107b8ae8d18 /svx | |
parent | e1e6cdbb1e9ff37f0bb740a70045c66953bec50c (diff) |
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor
when calling constructors like this:
Foo(OUString("xxx"), 1)
Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36
Reviewed-on: https://gerrit.libreoffice.org/33698
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/imapwnd.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmPropBrw.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 10 |
8 files changed, 20 insertions, 20 deletions
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index ed0ba4d929de..8f52dca70df2 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -65,7 +65,7 @@ IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XF pItemInfo = new SfxItemInfo[ 1 ]; memset( pItemInfo, 0, sizeof( SfxItemInfo ) ); - pIMapPool = new SfxItemPool( OUString("IMapItemPool"), + pIMapPool = new SfxItemPool( "IMapItemPool", SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo ); pIMapPool->FreezeIdRanges(); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 51137e4be4ac..f9f5202eaabb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -541,10 +541,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( OUString( "ControlContext" ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( "ContextDocument", makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( "ControlContext", makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( "ControlShapeAccess", makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 4db230f93b1a..42dfa92c62ce 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -616,7 +616,7 @@ FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), ConfigItemMode::DelayedUpdate) + ,FmXFormShell_CFGBASE("Office.Common/Misc", ConfigItemMode::DelayedUpdate) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( nullptr ) ,m_nActivationEvent( nullptr ) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 742f256ebdde..5511a633dc67 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -555,8 +555,8 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, m_eULSpaceUnit(), maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this), maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this), - maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, OUString("DecrementIndent"), rxFrame), - maIncIndentControl(SID_INC_INDENT, *pBindings,*this, OUString("IncrementIndent"), rxFrame), + maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, "DecrementIndent", rxFrame), + maIncIndentControl(SID_INC_INDENT, *pBindings,*this, "IncrementIndent", rxFrame), m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this), maContext(), mpBindings(pBindings), diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0eb00d295c9c..c7cabbe2a346 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -232,7 +232,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDirectionFloater" ) + ".uno:ExtrusionDirectionFloater" ) { } @@ -466,7 +466,7 @@ ExtrusionDepthController::ExtrusionDepthController( ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDepthFloater" ) + ".uno:ExtrusionDepthFloater" ) { } @@ -730,7 +730,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionDirectionFloater" ) + ".uno:ExtrusionDirectionFloater" ) { } @@ -865,7 +865,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), - OUString( ".uno:ExtrusionSurfaceFloater" ) + ".uno:ExtrusionSurfaceFloater" ) { } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index b71e796c3c8d..e9b19cda26d6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -353,7 +353,7 @@ public: FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) -: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) +: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkAlignment" ) { } @@ -577,7 +577,7 @@ public: FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Reference< XComponentContext >& rxContext ) -: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) ) +: svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkCharacterSpacingFloater" ) { } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 091ede2f2002..3cfd2f61afe2 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -265,7 +265,7 @@ void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), - OUString( ".uno:FontHeight" ) ), + ".uno:FontHeight" ), m_pBox( nullptr ) { addStatusListener( ".uno:CharFontName"); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 1f55336da921..e07d9f93a612 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -457,7 +457,7 @@ private: }; FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_FINDTEXT)) + : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), COMMAND_FINDTEXT) , m_pFindTextFieldControl(nullptr) , m_nDownSearchId(0) , m_nUpSearchId(0) @@ -748,7 +748,7 @@ private: MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString(COMMAND_MATCHCASE) ) + COMMAND_MATCHCASE ) , m_pMatchCaseControl(nullptr) { } @@ -868,7 +868,7 @@ private: SearchFormattedToolboxController::SearchFormattedToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString(COMMAND_SEARCHFORMATTED) ) + COMMAND_SEARCHFORMATTED ) , m_pSearchFormattedControl(nullptr) { } @@ -1093,7 +1093,7 @@ public: ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString( ".uno:ExitSearch" ) ) + ".uno:ExitSearch" ) { } @@ -1212,7 +1212,7 @@ public: SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), - OUString( ".uno:SearchLabel" ) ) + ".uno:SearchLabel" ) { } |