expand and remove dcsssf macro

6 files changed, 17 insertions, 22 deletions

diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index be90c11631e8..b49f245cdd3d 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -45,11 +45,10 @@ namespace func_provider
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
 
 
 class ScriptImpl :
-            public ::cppu::WeakImplHelper1 < dcsssf::provider::XScript >
+            public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::provider::XScript >
 {
 
 public:
@@ -60,7 +59,7 @@ public:
     */
     ScriptImpl(
         const css::uno::Reference< css::beans::XPropertySet > & scriptingContext,
-        const css::uno::Reference< dcsssf::runtime::XScriptInvocation > & runtimeMgr,
+        const css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > & runtimeMgr,
         const ::rtl::OUString& scriptURI )
     throw ( css::uno::RuntimeException );
 
@@ -102,7 +101,7 @@ public:
 
 private:
     css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext;
-    css::uno::Reference < dcsssf::runtime::XScriptInvocation > m_RunTimeManager;
+    css::uno::Reference < ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > m_RunTimeManager;
     ::rtl::OUString m_ScriptURI;
 
     /* copy ctor disabled, i.e. not defined */
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 1ee7580680d9..68f600128354 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -502,7 +502,7 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
         Reference< XInterface > xInterface( m_xContext->getValueByName(
                     OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ), UNO_QUERY_THROW );
         // check that we have permissions for this storage
-        Reference< dcsssf::security::XScriptSecurity > xScriptSecurity( xInterface, UNO_QUERY_THROW );
+        Reference< ::drafts::com::sun::star::script::framework::security::XScriptSecurity > xScriptSecurity( xInterface, UNO_QUERY_THROW );
         scripting_constants::ScriptingConstantsPool& scriptingConstantsPool =
                 scripting_constants::ScriptingConstantsPool::instance();
         // if we dealing with a document storage (ie. not user or share
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
index 09611e4bc0a0..4a068ed4b1e9 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
@@ -45,10 +45,9 @@ namespace scripting_runtimemgr
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
 
 class ScriptNameResolverImpl : public
-    ::cppu::WeakImplHelper1 < dcsssf::runtime::XScriptNameResolver >
+    ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver >
 {
 public:
     /**********************************************
@@ -80,17 +79,17 @@ public:
      @exception NullPointerException
      @return  the resolved XScriptURI
     */
-    css::uno::Reference < dcsssf::storage::XScriptInfo > SAL_CALL resolve(
+    css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfo > SAL_CALL resolve(
         const ::rtl::OUString & scriptURI,
         css::uno::Any& invocationCtx )
         throw( css::script::CannotConvertException, css::lang::IllegalArgumentException,
            css::uno::RuntimeException );
 private:
-    css::uno::Reference < dcsssf::storage::XScriptInfo >
+    css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfo >
     resolveURIFromStorageID( sal_Int32 sid, const rtl::OUString & docURI,
         const ::rtl::OUString & nameToResolve )
         SAL_THROW ( ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) );
-    css::uno::Reference< dcsssf::storage::XScriptInfoAccess >
+    css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess >
     getStorageInstance( sal_Int32 sid, const rtl::OUString & permissionURI)
         SAL_THROW ( ( css::uno::RuntimeException ) );
     ::rtl::OUString
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
index 0358ce7659ab..33fea58f3a5e 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
@@ -48,14 +48,13 @@ namespace scripting_runtimemgr
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
 
 /**
  * Class responsible for managing the various ScriptRuntime implementations.
  */
 class ScriptRuntimeManager : public
-    ::cppu::WeakImplHelper3< dcsssf::runtime::XScriptInvocation, css::lang::XServiceInfo,
-    dcsssf::runtime::XScriptNameResolver >
+    ::cppu::WeakImplHelper3< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation, css::lang::XServiceInfo,
+    ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver >
 {
 public:
     explicit ScriptRuntimeManager(
@@ -128,17 +127,17 @@ public:
      same as the documentStorageID.
      * @return the resolved URI
      */
-    virtual css::uno::Reference< dcsssf::storage::XScriptInfo > SAL_CALL resolve(
+    virtual css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfo > SAL_CALL resolve(
         const ::rtl::OUString& scriptUri,
         css::uno::Any& invocationCtx )
         throw( css::lang::IllegalArgumentException, css::script::CannotConvertException,
            css::uno::RuntimeException );
 
 private:
-    css::uno::Reference< dcsssf::runtime::XScriptInvocation > SAL_CALL getScriptRuntime(
+    css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > SAL_CALL getScriptRuntime(
         const css::uno::Reference< css::uno::XInterface > & scriptInfo )
         throw( css::uno::RuntimeException );
-    css::uno::Reference< dcsssf::runtime::XScriptNameResolver > SAL_CALL getScriptNameResolver()
+    css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver > SAL_CALL getScriptNameResolver()
         throw( css::uno::RuntimeException );
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx
index 052102de1ab7..153d174e9a63 100644
--- a/scripting/source/runtimemgr/StorageBridge.hxx
+++ b/scripting/source/runtimemgr/StorageBridge.hxx
@@ -40,9 +40,8 @@ namespace scripting_runtimemgr
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
 
-class StorageBridge : public ::cppu::WeakImplHelper1< dcsssf::storage::XScriptInfoAccess >
+class StorageBridge : public ::cppu::WeakImplHelper1< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess >
 {
     friend class StorageBridgeFactory;
 public:
@@ -57,7 +56,7 @@ public:
      * @return XScriptURI
      *      The URIs of the implementations
      */
-    virtual css::uno::Sequence< css::uno::Reference< dcsssf::storage::XScriptInfo > >
+    virtual css::uno::Sequence< css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfo > >
         SAL_CALL getImplementations(
             const ::rtl::OUString& queryURI )
         throw ( css::lang::IllegalArgumentException,
@@ -78,7 +77,7 @@ private:
 
     void initStorage() throw ( css::uno::RuntimeException );
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
-    css::uno::Reference< dcsssf::storage::XScriptInfoAccess > m_xScriptInfoAccess;
+    css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > m_xScriptInfoAccess;
     sal_Int32 m_sid;
 };
 }
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
index 591fe6de4e83..35f774d4ce00 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
@@ -41,7 +41,6 @@ namespace scripting_runtimemgr
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
 
 class StorageBridgeFactory
 {
@@ -49,7 +48,7 @@ class StorageBridgeFactory
 public:
     explicit StorageBridgeFactory(
         const css::uno::Reference < css::uno::XComponentContext > & xContext );
-    css::uno::Reference < dcsssf::storage::XScriptInfoAccess >
+    css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess >
         getStorageInstance( sal_Int32 sid );
 private:
     StorageBridgeFactory(); // No definition for default ctor