diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-28 15:27:32 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-28 18:52:22 +0100 |
commit | ba8413d2629352b1e5defaf154498856580e4651 (patch) | |
tree | 1fe88fed9227b84da0d44ee840cdd56b3418fc56 /vcl | |
parent | b2c89e7236d71d92a96430db0a7eca14b41c227a (diff) |
Introduce com.sun.star.frame.theUICommandDescription singleton.
Change-Id: Ic88cca3722d555ba48d7da8c176556fa1ff90650
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 0c33fb5e51ef..b859ff2a9352 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -192,7 +192,7 @@ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0294e3deb6eb..a9b8151d499a 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -39,7 +39,7 @@ #include <unotools/confignode.hxx> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> @@ -701,7 +701,7 @@ static OUString getCommandLabel(const OUString& rCommand, const uno::Reference<u try { uno::Reference<container::XNameAccess> xUICommandLabels; - uno::Reference<container::XNameAccess> xUICommandDescription(frame::UICommandDescription::create(rContext)); + uno::Reference<container::XNameAccess> xUICommandDescription(frame::theUICommandDescription::get(rContext)); if ((xUICommandDescription->getByName(rModuleId) >>= xUICommandLabels) && xUICommandLabels.is()) { |