diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-13 08:52:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-14 11:13:24 +0100 |
| commit | 24cad6a6490b245bd88ec3e3c87195628914f6a2 (patch) | |
| tree | 12d9e7ec629054f5ad0a6990783d3e639449afeb /scripting | |
| parent | 8061c8c70b7ffcd8f472d2f5b909911f2095fec7 (diff) | |
Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally.
Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Library_scriptframe.mk | 1 | ||||
| -rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 416c6490050c..5b37df720211 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ sal \ tl \ ucbhelper \ + utl \ $(gb_UWINAPI) \ )) diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index e9c510545bf6..79326b5149c3 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -24,7 +24,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/mediadescriptor.hxx> +#include <unotools/mediadescriptor.hxx> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -332,10 +332,10 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< css::uno::Reference< css::frame::XController > xCurrentController = model->getCurrentController(); if( xCurrentController.is() ) { - comphelper::MediaDescriptor aMD( model->getArgs() ); + utl::MediaDescriptor aMD( model->getArgs() ); sal_Bool bDefault = false; - sal_Bool bHidden = aMD.getUnpackedValueOrDefault( comphelper::MediaDescriptor::PROP_HIDDEN(), bDefault ); - sal_Bool bPreview = aMD.getUnpackedValueOrDefault( comphelper::MediaDescriptor::PROP_PREVIEW(), bDefault ); + sal_Bool bHidden = aMD.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN(), bDefault ); + sal_Bool bPreview = aMD.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), bDefault ); if( !bHidden && !bPreview ) { Reference< document::XEmbeddedScripts > xScripts( model, UNO_QUERY ); |