diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 3 | ||||
-rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 3 | ||||
-rw-r--r-- | framework/source/layoutmanager/helpers.cxx | 4 | ||||
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 3 | ||||
-rw-r--r-- | framework/source/recording/dispatchrecorder.cxx | 8 | ||||
-rw-r--r-- | framework/source/tabwin/tabwindow.cxx | 3 | ||||
-rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 3 |
7 files changed, 8 insertions, 19 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index ed13cb13cdad..2f257eb11926 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -969,10 +969,9 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: if ( sGlobalModules == CFG_ENTRY_GLOBAL ) { - OUString sModule; sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); if ( !sKey.isEmpty() && !sPath.isEmpty() ) - reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); + reloadChanged(sPrimarySecondary, sGlobalModules, OUString(), sKey); } else if ( sGlobalModules == CFG_ENTRY_MODULES ) { diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 56f6ea40b22d..543e309495c4 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -105,9 +105,8 @@ private: RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) { - OUString temp; css::uno::Reference< css::uno::XInterface > temp2; - css::document::NoSuchFilterRequest aFilterRequest( temp , + css::document::NoSuchFilterRequest aFilterRequest( OUString(), temp2 , sURL ); m_aRequest <<= aFilterRequest; diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index c68d732157eb..869e7829e077 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -195,8 +195,6 @@ WindowAlign ImplConvertAlignment( ui::DockingArea aAlignment ) OUString getElementTypeFromResourceURL( const OUString& aResourceURL ) { - OUString aType; - OUString aUIResourceURL( UIRESOURCE_URL ); if ( aResourceURL.startsWith( aUIResourceURL ) ) { @@ -207,7 +205,7 @@ OUString getElementTypeFromResourceURL( const OUString& aResourceURL ) return aPathPart.getToken( 0, '/', nIndex ); } - return aType; + return OUString(); } void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUString& aElementName ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 591afd80fb5d..cb0d8409e61d 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1137,11 +1137,10 @@ void LayoutManager::implts_setInplaceMenuBar( const Reference< XIndexAccess >& x if ( m_xFrame.is() && m_xContainerWindow.is() ) { - OUString aModuleIdentifier; Reference< XDispatchProvider > xDispatchProvider; VclPtr<MenuBar> pMenuBar = VclPtr<MenuBar>::Create(); - m_xInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, aModuleIdentifier, pMenuBar, true ); + m_xInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, OUString(), pMenuBar, true ); m_xInplaceMenuBar->SetItemContainer( xMergedMenuBar ); SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 387988b5bc39..7cc4ef5a31a1 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -112,19 +112,15 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css:: void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) { - OUString aTarget; - - css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, false ); + css::frame::DispatchStatement aStatement( aURL.Complete, OUString(), lArguments, 0, false ); m_aStatements.push_back( aStatement ); } void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) { - OUString aTarget; - // last parameter must be set to true -> it's a comment - css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, true ); + css::frame::DispatchStatement aStatement( aURL.Complete, OUString(), lArguments, 0, true ); m_aStatements.push_back( aStatement ); } diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 866662d5334b..bd4216e1c3c4 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -566,10 +566,9 @@ void SAL_CALL TabWindow::windowDeactivated( const css::lang::EventObject& ) sal_Int32 nNextTabID( m_nNextTabID++ ); - OUString aTitle; TabControl* pTabControl = impl_GetTabControl( m_xTabControlWindow ); if ( pTabControl ) - pTabControl->InsertPage( sal_uInt16( nNextTabID ), aTitle ); + pTabControl->InsertPage( sal_uInt16( nNextTabID ), OUString() ); aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 928a1fbf0c36..ea28334b7768 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1772,7 +1772,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame, Menu* pAddonMenu, b m_bIsBookmarkMenu = true; m_bShowMenuImages = true; - OUString aModuleIdentifier; m_xPopupMenuControllerFactory = frame::thePopupMenuControllerFactory::get( ::comphelper::getProcessComponentContext()); @@ -1790,7 +1789,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame, Menu* pAddonMenu, b { Reference< XDispatchProvider > xDispatchProvider; MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, rFrame, m_xURLTransformer, - xDispatchProvider, aModuleIdentifier, pPopupMenu, + xDispatchProvider, OUString(), pPopupMenu, false ); Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY ); |