Move MediaDescriptor from comphelper to unotools

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

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9

10 files changed, 113 insertions, 114 deletions

diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 8796f37a2539..4095d2a2c629 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -250,7 +250,6 @@
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/interaction.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -337,6 +336,7 @@
 #include <unotools/configpaths.hxx>
 #include <unotools/historyoptions.hxx>
 #include <unotools/localfilehelper.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index d960b2e4efeb..65d769151a98 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/evntpost.hxx>
 #include <cppuhelper/implbase5.hxx>
@@ -800,13 +800,13 @@ class AutoRecovery  : // attention! Must be the first base class to guarentee ri
         //---------------------------------------
         // TODO document me
         void implts_openOneDoc(const OUString&               sURL       ,
-                                     ::comphelper::MediaDescriptor& lDescriptor,
+                                     utl::MediaDescriptor& lDescriptor,
                                      AutoRecovery::TDocumentInfo&   rInfo      );
 
         //---------------------------------------
         // TODO document me
         void implts_generateNewTempURL(const OUString&               sBackupPath     ,
-                                             ::comphelper::MediaDescriptor& rMediaDescriptor,
+                                             utl::MediaDescriptor& rMediaDescriptor,
                                              AutoRecovery::TDocumentInfo&   rInfo           );
 
         //---------------------------------------
@@ -1006,11 +1006,11 @@ class AutoRecovery  : // attention! Must be the first base class to guarentee ri
                     is used to set the new created progress as parameter on these set.
          */
         void impl_establishProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
-                                          ::comphelper::MediaDescriptor&             rArgs    ,
+                                          utl::MediaDescriptor&             rArgs    ,
                                     const css::uno::Reference< css::frame::XFrame >& xNewFrame);
 
         void impl_forgetProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
-                                       ::comphelper::MediaDescriptor&             rArgs    ,
+                                       utl::MediaDescriptor&             rArgs    ,
                                  const css::uno::Reference< css::frame::XFrame >& xNewFrame);
 
         //---------------------------------------
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 3f020dbec9fe..6af1cb8be911 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -22,7 +22,7 @@
 #include <threadhelp/writeguard.hxx>
 #include <threadhelp/readguard.hxx>
 #include <services.h>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
@@ -181,8 +181,8 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
     OUString sTypeName;
 
     // Analyze given descriptor to find filename or input stream or ...
-    ::comphelper::MediaDescriptor aDescriptor( lDescriptor );
-    OUString               sURL       = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() );
+    utl::MediaDescriptor aDescriptor( lDescriptor );
+    OUString               sURL       = aDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
 
     long nLength = sURL.getLength();
     if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) )
@@ -193,7 +193,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
         //  a) look for given extension of url to map our type decision HARD CODED!!!
         //  b) return preferred type every time... it's easy :-)
         sTypeName = "oxt_OpenOffice_Extension";
-        aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
+        aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
         aDescriptor >> lDescriptor;
     }
 
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index b2e3762449af..08619ba3fc9c 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -41,7 +41,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
@@ -392,9 +392,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
             xModel = xController->getModel();
         if (xModel.is())
         {
-            ::comphelper::MediaDescriptor lDocArgs(xModel->getArgs());
+            utl::MediaDescriptor lDocArgs(xModel->getArgs());
             bHiddenDoc = lDocArgs.getUnpackedValueOrDefault(
-                ::comphelper::MediaDescriptor::PROP_HIDDEN(),
+                utl::MediaDescriptor::PROP_HIDDEN(),
                 (sal_Bool)sal_False);
         }
     }
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index dee4f0b435de..a2f258ec9b2a 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/implbase2.hxx>
 
@@ -148,7 +148,7 @@ private:
         @descr  Inside this struct e.g. the URL, its type and filter name,
                 the stream or a model directly are saved.
      */
-    ::comphelper::MediaDescriptor m_lMediaDescriptor;
+    utl::MediaDescriptor m_lMediaDescriptor;
 
     /** @short  because the mediadescriptor contains the complete URL ... but
                 some functionality need the structured version, we hold it twice :-(.
@@ -370,7 +370,7 @@ public:
     /** TODO document me ... */
     static  void initializeUIDefaults(
                 const css::uno::Reference< css::uno::XComponentContext >& i_rxContext,
-                ::comphelper::MediaDescriptor& io_lMediaDescriptor,
+                utl::MediaDescriptor& io_lMediaDescriptor,
                 const bool _bUIMode,
                 QuietInteraction** o_ppQuiteInteraction
             );
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 5cc82710aed0..6531b129dc0c 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/ui/XUIElement.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
@@ -274,8 +274,8 @@ sal_Bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel )
 {
     if ( xModel.is() )
     {
-        ::comphelper::MediaDescriptor aDesc( xModel->getArgs() );
-        return aDesc.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
+        utl::MediaDescriptor aDesc( xModel->getArgs() );
+        return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
     }
     else
         return sal_False;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 9d1999149635..ede067e2f05c 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -71,7 +71,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/instance.hxx>
 #include <unotools/cmdoptions.hxx>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 373c9b3d6ce5..a9b2dcbfed43 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -210,18 +210,18 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
 }
 
 //-----------------------------------------------
-::comphelper::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor)
+utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor)
 {
-    ::comphelper::MediaDescriptor lDescriptor(lOutsideDescriptor);
+    utl::MediaDescriptor lDescriptor(lOutsideDescriptor);
     css::uno::Reference< css::frame::XModel > xModel     = lDescriptor.getUnpackedValueOrDefault(
-                                                            ::comphelper::MediaDescriptor::PROP_MODEL (),
+                                                            utl::MediaDescriptor::PROP_MODEL (),
                                                             css::uno::Reference< css::frame::XModel > ());
     if (xModel.is ())
     {
-        ::comphelper::MediaDescriptor lModelDescriptor(xModel->getArgs());
-        ::comphelper::MediaDescriptor::iterator pIt = lModelDescriptor.find( ::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE() );
+        utl::MediaDescriptor lModelDescriptor(xModel->getArgs());
+        utl::MediaDescriptor::iterator pIt = lModelDescriptor.find( utl::MediaDescriptor::PROP_MACROEXECUTIONMODE() );
         if ( pIt != lModelDescriptor.end() )
-            lDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second;
+            lDescriptor[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second;
     }
 
     return lDescriptor;
@@ -269,7 +269,7 @@ void LoadEnv::initializeLoading(const OUString&
     // make URL part of the MediaDescriptor
     // It doesn't mater, if it is already an item of it.
     // It must be the same value ... so we can overwrite it :-)
-    m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_URL()] <<= sURL;
+    m_lMediaDescriptor[utl::MediaDescriptor::PROP_URL()] <<= sURL;
 
     // parse it - because some following code require that
     m_aURL.Complete = sURL;
@@ -279,10 +279,10 @@ void LoadEnv::initializeLoading(const OUString&
     // BTW: Split URL and JumpMark ...
     // Because such mark is an explicit value of the media descriptor!
     if (!m_aURL.Mark.isEmpty())
-        m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_JUMPMARK()] <<= m_aURL.Mark;
+        m_lMediaDescriptor[utl::MediaDescriptor::PROP_JUMPMARK()] <<= m_aURL.Mark;
 
     // By the way: remove the old and deprecated value "FileName" from the descriptor!
-    ::comphelper::MediaDescriptor::iterator pIt = m_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_FILENAME());
+    utl::MediaDescriptor::iterator pIt = m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FILENAME());
     if (pIt != m_lMediaDescriptor.end())
         m_lMediaDescriptor.erase(pIt);
 
@@ -295,8 +295,8 @@ void LoadEnv::initializeLoading(const OUString&
     // UI mode
     const bool bUIMode =
         ( ( m_eFeature & E_WORK_WITH_UI )                                                                          == E_WORK_WITH_UI ) &&
-        ( m_lMediaDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_HIDDEN() , sal_False ) == sal_False      ) &&
-        ( m_lMediaDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_PREVIEW(), sal_False ) == sal_False      );
+        ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN() , sal_False ) == sal_False      ) &&
+        ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), sal_False ) == sal_False      );
 
     initializeUIDefaults(
         m_xContext,
@@ -311,7 +311,7 @@ void LoadEnv::initializeLoading(const OUString&
 
 
 void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XComponentContext >& i_rxContext,
-                                    ::comphelper::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode,
+                                    utl::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode,
                                     QuietInteraction** o_ppQuietInteraction )
 {
     css::uno::Reference< css::task::XInteractionHandler > xInteractionHandler;
@@ -345,17 +345,17 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon
 
     if (
         (xInteractionHandler.is()                                                                                       ) &&
-        (io_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER()) == io_lMediaDescriptor.end())
+        (io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_INTERACTIONHANDLER()) == io_lMediaDescriptor.end())
        )
     {
-        io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= xInteractionHandler;
+        io_lMediaDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= xInteractionHandler;
     }
 
-    if (io_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()) == io_lMediaDescriptor.end())
-        io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] <<= nMacroMode;
+    if (io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()) == io_lMediaDescriptor.end())
+        io_lMediaDescriptor[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()] <<= nMacroMode;
 
-    if (io_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_UPDATEDOCMODE()) == io_lMediaDescriptor.end())
-        io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode;
+    if (io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_UPDATEDOCMODE()) == io_lMediaDescriptor.end())
+        io_lMediaDescriptor[utl::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode;
 }
 
 
@@ -613,11 +613,11 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
         return E_CAN_BE_LOADED;
 
     // using of an existing input stream
-    ::comphelper::MediaDescriptor                 stlMediaDescriptor(lMediaDescriptor);
-    ::comphelper::MediaDescriptor::const_iterator pIt;
+    utl::MediaDescriptor                 stlMediaDescriptor(lMediaDescriptor);
+    utl::MediaDescriptor::const_iterator pIt;
     if (ProtocolCheck::isProtocol(sURL,ProtocolCheck::E_PRIVATE_STREAM))
     {
-        pIt = stlMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_INPUTSTREAM());
+        pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_INPUTSTREAM());
         css::uno::Reference< css::io::XInputStream > xStream;
         if (pIt != stlMediaDescriptor.end())
             pIt->second >>= xStream;
@@ -630,7 +630,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     // using of a full featured document
     if (ProtocolCheck::isProtocol(sURL,ProtocolCheck::E_PRIVATE_OBJECT))
     {
-        pIt = stlMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_MODEL());
+        pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_MODEL());
         css::uno::Reference< css::frame::XModel > xModel;
         if (pIt != stlMediaDescriptor.end())
             pIt->second >>= xModel;
@@ -816,9 +816,9 @@ void LoadEnv::impl_detectTypeAndFilter()
     {
         // Orcus type detected.  Skip the normal type detection process.
         m_lMediaDescriptor << lDescriptor;
-        m_lMediaDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sType;
-        m_lMediaDescriptor[comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
-        m_lMediaDescriptor[comphelper::MediaDescriptor::PROP_FILTERPROVIDER()] <<= OUString("orcus");
+        m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
+        m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
+        m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERPROVIDER()] <<= OUString("orcus");
         return;
     }
 
@@ -838,10 +838,10 @@ void LoadEnv::impl_detectTypeAndFilter()
 
     // detection was successfully => update the descriptor member of this class
     m_lMediaDescriptor << lDescriptor;
-    m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sType;
+    m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
     // Is there an already detected (may be preselected) filter?
     // see below ...
-    sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
+    sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME(), OUString());
 
     aWriteLock.unlock();
     // <- SAFE
@@ -866,7 +866,7 @@ void LoadEnv::impl_detectTypeAndFilter()
             {
                 // SAFE ->
                 aWriteLock.lock();
-                m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
+                m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
                 aWriteLock.unlock();
                 // <- SAFE
             }
@@ -901,9 +901,9 @@ void LoadEnv::impl_detectTypeAndFilter()
         // SAFE ->
         aWriteLock.lock();
         // Don't overwrite external decisions! See comments before ...
-        ::comphelper::MediaDescriptor::const_iterator pAsTemplateItem = m_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_ASTEMPLATE());
+        utl::MediaDescriptor::const_iterator pAsTemplateItem = m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_ASTEMPLATE());
         if (pAsTemplateItem == m_lMediaDescriptor.end())
-            m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
+            m_lMediaDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
         aWriteLock.unlock();
         // <- SAFE
     }
@@ -917,7 +917,7 @@ sal_Bool LoadEnv::impl_handleContent()
     ReadGuard aReadLock(m_aLock);
 
     // the type must exist inside the descriptor ... otherwise this class is implemented wrong :-)
-    OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString());
+    OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(), OUString());
     if (sType.isEmpty())
         throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
 
@@ -1027,7 +1027,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
         // SAFE ->
         aReadLock.lock();
         css::uno::Reference< css::task::XInteractionHandler > xInteraction = m_lMediaDescriptor.getUnpackedValueOrDefault(
-                                                                                ::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER(),
+                                                                                utl::MediaDescriptor::PROP_INTERACTIONHANDLER(),
                                                                                 css::uno::Reference< css::task::XInteractionHandler >());
         aReadLock.unlock();
         // <- SAFE
@@ -1138,10 +1138,10 @@ sal_Bool LoadEnv::impl_loadContent()
     // So we prevent our code against wrong using. Why?
     // It could be, that using of this progress could make trouble. e.g. He make window visible ...
     // but shouldn't do that. But if no indicator is available ... nobody has a chance to do that!
-    sal_Bool                                           bHidden    = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_HIDDEN()         , sal_False                                           );
-    sal_Bool                                           bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_MINIMIZED()      , sal_False                                           );
-    sal_Bool                                           bPreview   = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PREVIEW()        , sal_False                                           );
-    css::uno::Reference< css::task::XStatusIndicator > xProgress  = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), css::uno::Reference< css::task::XStatusIndicator >());
+    sal_Bool                                           bHidden    = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN()         , sal_False                                           );
+    sal_Bool                                           bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED()      , sal_False                                           );
+    sal_Bool                                           bPreview   = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW()        , sal_False                                           );
+    css::uno::Reference< css::task::XStatusIndicator > xProgress  = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), css::uno::Reference< css::task::XStatusIndicator >());
 
     if (!bHidden && !bMinimized && !bPreview && !xProgress.is())
     {
@@ -1151,7 +1151,7 @@ sal_Bool LoadEnv::impl_loadContent()
         {
             xProgress = xProgressFactory->createStatusIndicator();
             if (xProgress.is())
-                m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xProgress;
+                m_lMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xProgress;
         }
     }
 
@@ -1221,7 +1221,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
     // Otherwise ...
     // We need this type information to locate an registered frame loader
     // Without such information we can't work!
-    OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString());
+    OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(), OUString());
     if (sType.isEmpty())
         throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
 
@@ -1306,9 +1306,9 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
     // or better its not allowed for some requests in general :-)
     if (
         ( ! TargetHelper::matchSpecialTarget(m_sTarget, TargetHelper::E_DEFAULT)                                               ) ||
-        (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
-//      (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_HIDDEN()     , sal_False) == sal_True) ||
-        (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
+        (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
+//      (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN()     , sal_False) == sal_True) ||
+        (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
        )
     {
         return css::uno::Reference< css::frame::XFrame >();
@@ -1337,7 +1337,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
     // Note: To detect if a document was already loaded before
     // we check URLs here only. But might the existing and the required
     // document has different versions! Then its URLs are the same ...
-    sal_Int16 nNewVersion = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_VERSION(), (sal_Int16)(-1));
+    sal_Int16 nNewVersion = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VERSION(), (sal_Int16)(-1));
 
     // will be used to save the first hidden frame referring the searched model
     // Normally we are interested on visible frames ... but if there is no such visible
@@ -1384,9 +1384,9 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
             // and decide if its really the same then the one will be.
             // It must be visible and must use the same file revision ...
             // or must not have any file revision set (-1 == -1!)
-            ::comphelper::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
+            utl::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
 
-            if (lOldDocDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_VERSION(), (sal_Int32)(-1)) != nNewVersion)
+            if (lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VERSION(), (sal_Int32)(-1)) != nNewVersion)
             {
                 xTask.clear ();
                 continue;
@@ -1395,7 +1395,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
             // Hidden frames are special.
             // They will be used as "last chance" if there is no visible frame pointing to the same model.
             // Safe the result but continue with current loop might be looking for other visible frames.
-            ::sal_Bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_HIDDEN(), sal_False);
+            ::sal_Bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False);
             if (
                 (   bIsHidden       ) &&
                 ( ! xHiddenTask.is())
@@ -1466,7 +1466,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
     // It doesn't matter if somewhere wants to create a new view
     // or open a new untitled document ...
     // The only exception form that - hidden frames!
-    if (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_HIDDEN(), sal_False) == sal_True)
+    if (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False) == sal_True)
         return css::uno::Reference< css::frame::XFrame >();
 
     css::uno::Reference< css::frame::XFramesSupplier > xSupplier( css::frame::Desktop::create( m_xContext ), css::uno::UNO_QUERY);
@@ -1483,8 +1483,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
 
     // These states indicates a wish for creation of a new view in general.
     if (
-        (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
-        (m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
+        (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
+        (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
        )
     {
         return css::uno::Reference< css::frame::XFrame >();
@@ -1602,8 +1602,8 @@ void LoadEnv::impl_reactForLoadingState()
         // Note: We show new created frames here only.
         // We dont hide already visible frames here ...
         css::uno::Reference< css::awt::XWindow > xWindow      = m_xTargetFrame->getContainerWindow();
-        sal_Bool                                 bHidden      = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_HIDDEN(), sal_False);
-        sal_Bool                                 bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_MINIMIZED(), sal_False);
+        sal_Bool                                 bHidden      = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False);
+        sal_Bool                                 bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), sal_False);
 
         if (bMinimized)
         {
@@ -1623,7 +1623,7 @@ void LoadEnv::impl_reactForLoadingState()
         // Note: Only if an existing property "FrameName" is given by this media descriptor,
         // it should be used. Otherwise we should do nothing. May be the outside code has already
         // set a frame name on the target!
-        ::comphelper::MediaDescriptor::const_iterator pFrameName = m_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_FRAMENAME());
+        utl::MediaDescriptor::const_iterator pFrameName = m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FRAMENAME());
         if (pFrameName != m_lMediaDescriptor.end())
         {
             OUString sFrameName;
@@ -1722,7 +1722,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
     if ( pWindow )
     {
         bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault(
-                ::comphelper::MediaDescriptor::PROP_PREVIEW(), sal_False) );
+                utl::MediaDescriptor::PROP_PREVIEW(), sal_False) );
 
         bool bForceFrontAndFocus(false);
         if ( !preview )
@@ -1788,7 +1788,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
 
     // no filter -> no module -> no persistent window state
     OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(
-                                    ::comphelper::MediaDescriptor::PROP_FILTERNAME(),
+                                    utl::MediaDescriptor::PROP_FILTERNAME(),
                                     OUString());
     if (sFilter.isEmpty())
         return;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index d628c1c18dd5..0c7e3b2d6ed3 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -68,7 +68,7 @@
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 
 #include <comphelper/configurationhelper.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
@@ -1651,11 +1651,11 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
 
     aCacheLock.unlock();
 
-    ::comphelper::MediaDescriptor lDescriptor(xDocument->getArgs());
+    utl::MediaDescriptor lDescriptor(xDocument->getArgs());
 
     // check if this document must be ignored for recovery !
     // Some use cases dont wish support for AutoSave/Recovery ... as e.g. OLE-Server / ActiveX Control etcpp.
-    sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False));
+    sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False));
     if (bNoAutoSave)
         return;
 
@@ -1714,7 +1714,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     // and save an information about the real used filter by this document.
     // We save this document with DefaultFilter ... and load it with the RealFilter.
     implts_specifyDefaultFilterAndExtension(aNew);
-    aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME()  , OUString());
+    aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME()  , OUString());
 
     // Further we must know, if this document base on a template.
     // Then we must load it in a different way.
@@ -1902,17 +1902,17 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr
     rInfo.OldTempURL = "";
     rInfo.NewTempURL = "";
 
-    ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
-    rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
+    utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
+    rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME(), OUString());
 
     css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument, css::uno::UNO_QUERY);
     if (xDocTitle.is ())
         rInfo.Title = xDocTitle->getTitle ();
     else
     {
-        rInfo.Title      = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE()     , OUString());
+        rInfo.Title      = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TITLE()     , OUString());
         if (rInfo.Title.isEmpty())
-            rInfo.Title  = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString());
+            rInfo.Title  = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString());
     }
 
     rInfo.UsedForSaving = sal_False;
@@ -2103,8 +2103,8 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo)
     if (! rInfo.Document.is())
         return sal_True;
 
-    ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
-    sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False));
+    utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
+    sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False));
 
     return bNoAutoSave;
 }
@@ -2299,29 +2299,29 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
     if (!rInfo.Document.is())
         return;
 
-    ::comphelper::MediaDescriptor lOldArgs(rInfo.Document->getArgs());
+    utl::MediaDescriptor lOldArgs(rInfo.Document->getArgs());
     implts_generateNewTempURL(sBackupPath, lOldArgs, rInfo);
 
     // if the document was loaded with a password, it should be
     // stored with password
-    ::comphelper::MediaDescriptor lNewArgs;
-    OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), OUString());
+    utl::MediaDescriptor lNewArgs;
+    OUString sPassword = lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), OUString());
     if (!sPassword.isEmpty())
-        lNewArgs[::comphelper::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
+        lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
 
     // Further it must be saved using the default file format of that application.
     // Otherwhise we will some data lost.
     if (!rInfo.DefaultFilter.isEmpty())
-        lNewArgs[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.DefaultFilter;
+        lNewArgs[utl::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.DefaultFilter;
 
     // prepare frame/document/mediadescriptor in a way, that it uses OUR progress .-)
     if (xExternalProgress.is())
-        lNewArgs[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xExternalProgress;
+        lNewArgs[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xExternalProgress;
     impl_establishProgress(rInfo, lNewArgs, css::uno::Reference< css::frame::XFrame >());
 
     // #i66598# use special handling of property "DocumentBaseURL" (it must be an empty string!)
     // for make hyperlinks working
-    lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
+    lNewArgs[utl::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
 
     // try to save this document as a new temp file everytimes.
     // Mark AutoSave state as "INCOMPLETE" if it failed.
@@ -2458,17 +2458,17 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
             continue;
         }
 
-        ::comphelper::MediaDescriptor lDescriptor;
+        utl::MediaDescriptor lDescriptor;
 
         // its an UI feature - so the "USER" itself must be set as referer
-        lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= OUString(REFERRER_USER);
-        lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
+        lDescriptor[utl::MediaDescriptor::PROP_REFERRER()] <<= OUString(REFERRER_USER);
+        lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
 
         // recovered documents are loaded hidden, and shown all at once, later
-        lDescriptor[::comphelper::MediaDescriptor::PROP_HIDDEN()] <<= true;
+        lDescriptor[utl::MediaDescriptor::PROP_HIDDEN()] <<= true;
 
         if (aParams.m_xProgress.is())
-            lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress;
+            lDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress;
 
         sal_Bool bBackupWasTried   = (
                                         ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_BACKUP  ) == AutoRecovery::E_TRY_LOAD_BACKUP) || // temp. state!
@@ -2503,13 +2503,13 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         else if (!rInfo.TemplateURL.isEmpty())
         {
             sLoadOriginalURL = rInfo.TemplateURL;
-            lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()]   <<= sal_True;
-            lDescriptor[::comphelper::MediaDescriptor::PROP_TEMPLATENAME()] <<= rInfo.TemplateURL;
+            lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()]   <<= sal_True;
+            lDescriptor[utl::MediaDescriptor::PROP_TEMPLATENAME()] <<= rInfo.TemplateURL;
         }
         else if (!rInfo.FactoryURL.isEmpty())
         {
             sLoadOriginalURL = rInfo.FactoryURL;
-            lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
+            lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
         }
 
         // A "Salvaged" item must exists every time. The core can make something special then for recovery.
@@ -2519,7 +2519,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         {
             sURL = sLoadBackupURL;
             rInfo.DocumentState |= AutoRecovery::E_TRY_LOAD_BACKUP;
-            lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= sLoadOriginalURL;
+            lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE()] <<= sLoadOriginalURL;
         }
         else if (!sLoadOriginalURL.isEmpty())
         {
@@ -2569,8 +2569,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
 
         if (!rInfo.RealFilter.isEmpty())
         {
-            ::comphelper::MediaDescriptor lPatchDescriptor(rInfo.Document->getArgs());
-            lPatchDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.RealFilter;
+            utl::MediaDescriptor lPatchDescriptor(rInfo.Document->getArgs());
+            lPatchDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.RealFilter;
             rInfo.Document->attachResource(rInfo.Document->getURL(), lPatchDescriptor.getAsConstPropertyValueList());
                 // do *not* use sURL here. In case this points to the recovery file, it has already been passed
                 // to recoverFromFile. Also, passing it here is logically wrong, as attachResource is intended
@@ -2615,7 +2615,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
 
 //-----------------------------------------------
 void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
-                                           ::comphelper::MediaDescriptor& lDescriptor,
+                                           utl::MediaDescriptor& lDescriptor,
                                            AutoRecovery::TDocumentInfo&   rInfo      )
 {
     // SAFE -> ----------------------------------
@@ -2636,9 +2636,9 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
         // put the filter name into the descriptor - we're not going to involve any type detection, so
         // the document might be lost without the FilterName property
         if ( (rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL)
-            lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
+            lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
         else
-            lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.DefaultFilter;
+            lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.DefaultFilter;
 
         if ( sURL == rInfo.FactoryURL )
         {
@@ -2657,7 +2657,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
             Reference< XDocumentRecovery > xDocRecover( xModel, UNO_QUERY_THROW );
             xDocRecover->recoverFromFile(
                 sURL,
-                lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ),
+                lDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ),
                 lDescriptor.getAsConstPropertyValueList()
             );
 
@@ -2740,7 +2740,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
 
 //-----------------------------------------------
 void AutoRecovery::implts_generateNewTempURL(const OUString&               sBackupPath     ,
-                                                   ::comphelper::MediaDescriptor& /*rMediaDescriptor*/,
+                                                   utl::MediaDescriptor& /*rMediaDescriptor*/,
                                                    AutoRecovery::TDocumentInfo&   rInfo           )
 {
     // SAFE -> ----------------------------------
@@ -3468,7 +3468,7 @@ void AutoRecovery::impl_showFullDiscError()
 
 //-----------------------------------------------
 void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
-                                                ::comphelper::MediaDescriptor&             rArgs    ,
+                                                utl::MediaDescriptor&             rArgs    ,
                                           const css::uno::Reference< css::frame::XFrame >& xNewFrame)
 {
     // external well known frame must be preferred (because it was created by ourself
@@ -3491,7 +3491,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&
     // Only if there is no progress, we can create our own one.
     css::uno::Reference< css::task::XStatusIndicator > xInternalProgress;
     css::uno::Reference< css::task::XStatusIndicator > xExternalProgress = rArgs.getUnpackedValueOrDefault(
-                                                                                ::comphelper::MediaDescriptor::PROP_STATUSINDICATOR(),
+                                                                                utl::MediaDescriptor::PROP_STATUSINDICATOR(),
                                                                                 css::uno::Reference< css::task::XStatusIndicator >() );
 
     // Normaly a progress is set from outside (e.g. by the CrashSave/Recovery dialog, which uses our dispatch API).
@@ -3529,12 +3529,12 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&
 
     // But inside the MediaDescriptor we must set our own create progress ...
     // in case there is not already another progress set.
-    rArgs.createItemIfMissing(::comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress);
+    rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress);
 }
 
 //-----------------------------------------------
 void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
-                                             ::comphelper::MediaDescriptor&             rArgs    ,
+                                             utl::MediaDescriptor&             rArgs    ,
                                        const css::uno::Reference< css::frame::XFrame >& xNewFrame)
 {
     // external well known frame must be preferred (because it was created by ourself
@@ -3559,7 +3559,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&
         xFrameProps->setPropertyValue(FRAME_PROPNAME_INDICATORINTERCEPTION, css::uno::makeAny(css::uno::Reference< css::task::XStatusIndicator >()));
 
     // forget progress inside list of arguments.
-    ::comphelper::MediaDescriptor::iterator pArg = rArgs.find(::comphelper::MediaDescriptor::PROP_STATUSINDICATOR());
+    utl::MediaDescriptor::iterator pArg = rArgs.find(utl::MediaDescriptor::PROP_STATUSINDICATOR());
     if (pArg != rArgs.end())
     {
         rArgs.erase(pArg);
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index db552106ef36..4c64d0ff3e56 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -59,7 +59,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/miscopt.hxx>
 #include <svl/imageitm.hxx>
@@ -1652,9 +1652,9 @@ sal_Bool ToolBarManager::IsPluginMode() const
         if ( xModel.is() )
         {
             Sequence< PropertyValue > aSeq = xModel->getArgs();
-            comphelper::MediaDescriptor aMediaDescriptor( aSeq );
+            utl::MediaDescriptor aMediaDescriptor( aSeq );
             bPluginMode = aMediaDescriptor.getUnpackedValueOrDefault< sal_Bool >(
-                            comphelper::MediaDescriptor::PROP_VIEWONLY(), sal_False );
+                            utl::MediaDescriptor::PROP_VIEWONLY(), sal_False );
         }
     }