diff options
-rw-r--r-- | cui/source/customize/acccfg.cxx | 5 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 5 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 5 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/control/opendoccontrols.cxx | 4 | ||||
-rw-r--r-- | desktop/source/app/app.cxx | 5 | ||||
-rw-r--r-- | desktop/source/migration/migration.cxx | 6 | ||||
-rw-r--r-- | forms/source/helper/commanddescriptionprovider.cxx | 4 | ||||
-rw-r--r-- | framework/source/lomenubar/FrameHelper.cxx | 4 | ||||
-rw-r--r-- | offapi/UnoApi_offapi.mk | 2 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/UICommandDescription.idl (renamed from offapi/com/sun/star/ui/UICommandDescription.idl) | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/dialog/recfloat.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 5 | ||||
-rw-r--r-- | svtools/source/uno/contextmenuhelper.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 7 |
18 files changed, 51 insertions, 36 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 957eb381670f..8ed9d6c09381 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/awt/KeyModifier.hpp> @@ -852,7 +852,8 @@ void SfxAcceleratorConfigPage::InitAccCfg() // no - initialize this instance m_xSMGR = ::comphelper::getProcessServiceFactory(); - m_xUICmdDescription = css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()); + m_xUICmdDescription = css::frame::UICommandDescription::create( + comphelper::ComponentContext(m_xSMGR).getUNOContext()); // get the current active frame, which should be our "parent" // for this session diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 0a0e70611516..626a25dd6828 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -75,7 +75,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -914,7 +914,8 @@ SaveInData::SaveInData( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNameAccess( - css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xServiceManager).getUNOContext()) ); + css::frame::UICommandDescription::create( + comphelper::ComponentContext(m_xServiceManager).getUNOContext()) ); xNameAccess->getByName( aModuleId ) >>= m_xCommandToLabelMap; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 44cd36bebcbf..0f08675ec4da 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/document/XDocumentInfoSupplier.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include "acccfg.hrc" #include "helpid.hrc" @@ -586,7 +586,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul m_xGlobalCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xSMGR->createInstance(SERVICE_UICATEGORYDESCRIPTION), css::uno::UNO_QUERY_THROW); m_xModuleCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xGlobalCategoryInfo->getByName(m_sModuleLongName) , css::uno::UNO_QUERY_THROW); - m_xUICmdDescription = css::ui::UICommandDescription::create(::comphelper::ComponentContext(m_xSMGR).getUNOContext()); + m_xUICmdDescription = css::frame::UICommandDescription::create( + ::comphelper::ComponentContext(m_xSMGR).getUNOContext()); InitModule(); InitBasic(); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 8ccafd287706..280393a6486f 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -62,7 +62,7 @@ #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/DispatchInformation.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> using ::rtl::OUString; using namespace ::com::sun::star; @@ -425,7 +425,8 @@ void SvxConfigGroupListBox_Impl::Init() }catch(const uno::Exception&) { aModuleId = ::rtl::OUString(); } - Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(xContext) ); + Reference< container::XNameAccess > const xNameAccess( + frame::UICommandDescription::create(xContext) ); xNameAccess->getByName( aModuleId ) >>= m_xModuleCommands; Reference< container::XNameAccess > xAllCategories( diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 693c02b19e67..886cdc11e3d5 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/ui/XImageManager.hpp> @@ -58,7 +58,7 @@ namespace dbaui using ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier; using ::com::sun::star::ui::XUIConfigurationManager; using ::com::sun::star::ui::XImageManager; - using ::com::sun::star::ui::UICommandDescription; + using ::com::sun::star::frame::UICommandDescription; using ::com::sun::star::graphic::XGraphic; String GetCommandText( const sal_Char* _pCommandURL, const ::rtl::OUString& _rModuleName ) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d6e3cd7a0d52..7208345650d3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -67,7 +67,7 @@ #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIElementFactoryRegistration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> @@ -2092,7 +2092,8 @@ void Desktop::PreloadConfigurationData() { Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory(); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XNameAccess > xNameAccess( css::ui::UICommandDescription::create(xContext) ); + Reference< XNameAccess > xNameAccess( + css::frame::UICommandDescription::create(xContext) ); rtl::OUString aWriterDoc( "com.sun.star.text.TextDocument" ); rtl::OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 57e93aba893f..fe98ad01036f 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -61,7 +61,7 @@ #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> @@ -92,7 +92,9 @@ static const char XDG_CONFIG_PART[] = "/.config"; ::rtl::OUString sLabel; uno::Reference< container::XNameAccess > xUICommands; - uno::Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(::comphelper::getProcessComponentContext()) ); + uno::Reference< container::XNameAccess > const xNameAccess( + frame::UICommandDescription::create( + ::comphelper::getProcessComponentContext()) ); xNameAccess->getByName( sModuleIdentifier ) >>= xUICommands; if (xUICommands.is()) { diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index 900e3ceed558..fe17051febea 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <comphelper/namedvaluecollection.hxx> #include <tools/diagnose_ex.h> @@ -51,7 +51,7 @@ namespace frm using ::com::sun::star::frame::ModuleManager; using ::com::sun::star::frame::XModuleManager2; using ::com::sun::star::beans::PropertyValue; - using ::com::sun::star::ui::UICommandDescription; + using ::com::sun::star::frame::UICommandDescription; /** === end UNO using === **/ //==================================================================== diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index e8fd68fb24ea..4452a02cda73 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -58,7 +58,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -114,7 +114,7 @@ using com::sun::star::uno::Sequence; using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XInterface; using com::sun::star::ui::XUIElement; -using com::sun::star::ui::UICommandDescription; +using com::sun::star::frame::UICommandDescription; using com::sun::star::ui::XUIConfigurationManager; using com::sun::star::ui::XUIConfigurationManagerSupplier; using com::sun::star::ui::XAcceleratorConfiguration; diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 8a56c3b87939..db5f8ccec969 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -135,6 +135,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DocumentTemplates \ MediaTypeDetectionHelper \ ModuleManager \ + UICommandDescription \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ @@ -290,7 +291,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ GlobalAcceleratorConfiguration \ ModuleUIConfigurationManagerSupplier \ - UICommandDescription \ WindowContentFactory \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/frame/UICommandDescription.idl index c5b8b76f554d..1f2d3cd1ab71 100644 --- a/offapi/com/sun/star/ui/UICommandDescription.idl +++ b/offapi/com/sun/star/frame/UICommandDescription.idl @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_ui_UICommandDescription_idl__ -#define __com_sun_star_ui_UICommandDescription_idl__ +#ifndef __com_sun_star_frame_UICommandDescription_idl__ +#define __com_sun_star_frame_UICommandDescription_idl__ #include <com/sun/star/container/XNameAccess.idl> -module com { module sun { module star { module ui { +module com { module sun { module star { module frame { /** a service which provides information about user interface commands of modules. diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 62373201ae30..c34bb2ed116a 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -64,7 +64,7 @@ #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <unotools/historyoptions.hxx> #include <osl/file.hxx> #include <sfx2/filedlghelper.hxx> @@ -1757,7 +1757,8 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL if ( ! xContext.is()) break; - Reference<container::XNameAccess> xNameAccess ( ui::UICommandDescription::create(xContext) ); + Reference<container::XNameAccess> const xNameAccess( + frame::UICommandDescription::create(xContext) ); Any a = xNameAccess->getByName( "com.sun.star.presentation.PresentationDocument"); a >>= xUICommandLabels; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 624c25f62410..764884112fae 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include "ViewShellBase.hxx" #include <algorithm> @@ -1149,7 +1149,8 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB if( !aModuleIdentifier.isEmpty() ) { - Reference< XNameAccess > xNameAccess( ui::UICommandDescription::create(xContext) ); + Reference< XNameAccess > const xNameAccess( + frame::UICommandDescription::create(xContext) ); Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index edb28dc22818..e1b1dad6980b 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <svl/eitem.hxx> #include <svtools/generictoolboxcontroller.hxx> @@ -63,7 +63,7 @@ static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, c xUICommandDescription = xTmpNameAccess; if ( !xUICommandDescription.is() ) { - xUICommandDescription = ui::UICommandDescription::create(xContext); + xUICommandDescription = frame::UICommandDescription::create(xContext); xTmpNameAccess = xUICommandDescription; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 7e994dcfd9fb..df3a812d358c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include "sfx2/sfxhelp.hxx" #include <sfx2/app.hxx> @@ -2534,7 +2534,8 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) //create a popup menu in Writer boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu); uno::Reference< container::XNameAccess > xNameAccess( - ui::UICommandDescription::create(::comphelper::getProcessComponentContext()) ); + frame::UICommandDescription::create( + ::comphelper::getProcessComponentContext()) ); uno::Reference< container::XNameAccess > xUICommands; rtl::OUString sTextDoc("com.sun.star.text.TextDocument"); if(xNameAccess->hasByName(sTextDoc)) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0a4a0def55e5..9af76d8953a8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <comphelper/componentcontext.hxx> #include <cppuhelper/implbase1.hxx> @@ -248,7 +248,8 @@ static ::rtl::OUString RetrieveLabelFromCommand( if ( !xNameAccess.is() ) { xNameAccess = css::uno::Reference< css::container::XNameAccess >( - css::ui::UICommandDescription::create(comphelper::ComponentContext(xSMGR).getUNOContext()), + css::frame::UICommandDescription::create( + comphelper::ComponentContext(xSMGR).getUNOContext()), css::uno::UNO_QUERY_THROW ); s_xNameAccess = xNameAccess; } diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index a452e6b95b30..4b31039d8b50 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -437,7 +437,8 @@ ContextMenuHelper::associateUIConfigurationManagers() } uno::Reference< container::XNameAccess > xNameAccess( - ui::UICommandDescription::create(::comphelper::getProcessComponentContext()), + frame::UICommandDescription::create( + ::comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW ); try { diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 956c87ddb03e..4570e82b25f1 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -89,7 +89,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> using namespace ::com::sun::star; @@ -333,7 +333,10 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) { try { - uno::Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(::comphelper::getProcessComponentContext() ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > const xNameAccess( + frame::UICommandDescription::create( + ::comphelper::getProcessComponentContext() ), + uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xUICommandLabels; uno::Any a = xNameAccess->getByName( "com.sun.star.text.TextDocument" ); uno::Reference< container::XNameAccess > xUICommands; |