diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 19:20:12 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 10:47:26 +0000 |
| commit | d7801c39826f2f24f7340e1b25809d3bb65d6099 (patch) | |
| tree | 6acf82af5954e72930272fd62ac37c07664cf937 /framework/source | |
| parent | b34eab5996c52269360d166815ef15a250627c48 (diff) | |
Namespace cleanup and disambiguation
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739
Reviewed-on: https://gerrit.libreoffice.org/19900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 7 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 9df0745b9f7b..56ae8e47d55b 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -604,7 +604,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone // update window list ::std::vector< OUString > aNewWindowListVector; - Reference< XDesktop2 > xDesktop = Desktop::create( xContext ); + Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( xContext ); sal_uInt16 nActiveItemId = 0; sal_uInt16 nItemId = START_ITEMID_WINDOWLIST; @@ -831,7 +831,7 @@ IMPL_LINK_TYPED( MenuManager, Select, Menu *, pMenu, bool ) { // window list menu item selected - Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext ); + Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext ); sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST; Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY ); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index e5db95fd3611..c393dd433403 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -50,7 +50,7 @@ #define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" #define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" #define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" +#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" #define ATTRIBUTE_NS_ID "menu:id" #define ATTRIBUTE_NS_LABEL "menu:label" diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 0f93f62e5fa9..90f95ab91bdb 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -91,13 +91,6 @@ static OUString getMasterCommand( const OUString& rCommand ) return aMasterCommand; } -struct ExecuteInfo -{ - css::uno::Reference< css::frame::XDispatch > xDispatch; - css::util::URL aTargetURL; - css::uno::Sequence< css::beans::PropertyValue > aArgs; -}; - GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 399c667a3487..85fa140577a4 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -995,7 +995,7 @@ IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool ) { // window list menu item selected - Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext ); + Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext ); sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST; Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY ); |