Move MediaDescriptor from comphelper to unotools

...so it will be able to use SvtSecurityOptions internally.

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9

3 files changed, 4 insertions, 5 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 5ac608d9250f..9521901b3045 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -352,7 +352,6 @@
 #include <comphelper/expandmacro.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/genericpropertyset.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/oslfile2streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
@@ -838,6 +837,7 @@
 #include <unotools/linguprops.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/localfilehelper.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/saveopt.hxx>
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 5a2c061087c7..02b7c3f11ee6 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -22,7 +22,7 @@
 
 #include "ViewTabBar.hxx"
 #include "framework/FrameworkHelper.hxx"
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include "DrawController.hxx"
@@ -128,9 +128,9 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments)
             if (pController != NULL)
                 mpViewShellBase = pController->GetViewShellBase();
 
-            ::comphelper::MediaDescriptor aDescriptor (mxController->getModel()->getArgs());
+            utl::MediaDescriptor aDescriptor (mxController->getModel()->getArgs());
             if ( ! aDescriptor.getUnpackedValueOrDefault(
-                ::comphelper::MediaDescriptor::PROP_PREVIEW(),
+                utl::MediaDescriptor::PROP_PREVIEW(),
                 sal_False))
             {
                 // Register the factory for its supported tool bars.
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index d8e081301922..4b2dc84d37e3 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -12,7 +12,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <config_version.h>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>