writerfilter: drop global 'using css' from WW8ResourceModel.hxx

Change-Id: I2196a1df09a6f35e4de3ab3cc84bc1e149cd8f61

6 files changed, 29 insertions, 31 deletions

diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index cb65fe269819..9266f0834478 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -124,9 +124,9 @@ public:
     /// Enable storing of seen tokens in a named grab bag.
     void enableInteropGrabBag(const OUString& aName);
     /// Get the stored tokens and clear the internal storage.
-    beans::PropertyValue getInteropGrabBag();
+    css::beans::PropertyValue getInteropGrabBag();
 
-    uno::Sequence<beans::PropertyValue> GetThemeFontLangProperties() const;
+    css::uno::Sequence<css::beans::PropertyValue> GetThemeFontLangProperties() const;
     css::uno::Sequence<css::beans::PropertyValue> GetCompatSettings() const;
 
     void HandleRedline( Sprm& rSprm );
@@ -150,7 +150,7 @@ private:
                            writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
     virtual void lcl_substream(Id name,
                                ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    virtual void lcl_info(const string & info) SAL_OVERRIDE;
+    virtual void lcl_info(const std::string & info) SAL_OVERRIDE;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index d75b84512148..ee2b1aa808cb 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -139,7 +139,7 @@ public:
 
        DEBUGGING PURPOSE ONLY.
      */
-    virtual string getType() const SAL_OVERRIDE = 0;
+    virtual std::string getType() const SAL_OVERRIDE = 0;
 
     /**
        Resolves a footnote to a stream handler.
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index c33c03c4698c..89c2a341c428 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -31,26 +31,26 @@ namespace writerfilter
 class LoggedResourcesHelper
 {
 public:
-    explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix);
+    explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
     virtual ~LoggedResourcesHelper();
 
-    void startElement(const string & sElement);
-    void endElement(const string & sElement);
+    void startElement(const std::string & sElement);
+    void endElement(const std::string & sElement);
     void chars(const OUString & rChars);
-    void chars(const string & rChars);
-    void attribute(const string & rName, const string & rValue);
-    void attribute(const string & rName, sal_uInt32 nValue);
+    void chars(const std::string & rChars);
+    void attribute(const std::string & rName, const std::string & rValue);
+    void attribute(const std::string & rName, sal_uInt32 nValue);
 
 private:
     TagLogger::Pointer_t mpLogger;
-    string msPrefix;
+    std::string msPrefix;
 };
 #endif
 
 class LoggedStream : public Stream
 {
 public:
-    explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix);
+    explicit LoggedStream(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
     virtual ~LoggedStream();
 
     void startSectionGroup() SAL_OVERRIDE;
@@ -67,7 +67,7 @@ public:
     void props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
     void table(Id name, writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
     void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    void info(const string & info) SAL_OVERRIDE;
+    void info(const std::string & info) SAL_OVERRIDE;
 
 protected:
     virtual void lcl_startSectionGroup() = 0;
@@ -84,7 +84,7 @@ protected:
     virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) = 0;
     virtual void lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref) = 0;
     virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0;
-    virtual void lcl_info(const string & info) = 0;
+    virtual void lcl_info(const std::string & info) = 0;
 
 #ifdef DEBUG_LOGGING
     LoggedResourcesHelper mHelper;
@@ -94,7 +94,7 @@ protected:
 class LoggedProperties : public Properties
 {
 public:
-    explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix);
+    explicit LoggedProperties(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
     virtual ~LoggedProperties();
 
     void attribute(Id name, Value & val) SAL_OVERRIDE;
@@ -112,7 +112,7 @@ protected:
 class LoggedTable : public Table
 {
 public:
-    explicit LoggedTable(TagLogger::Pointer_t pLogger, const string & sPrefix);
+    explicit LoggedTable(TagLogger::Pointer_t pLogger, const std::string & sPrefix);
     virtual ~LoggedTable();
 
     void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx
index 5fe3c692a943..c5d18dfc4533 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -32,7 +32,7 @@ namespace writerfilter
 class QNameToString
 {
     typedef boost::shared_ptr<QNameToString> Pointer_t;
-    typedef std::map < Id, string > Map;
+    typedef std::map < Id, std::string > Map;
 
     static Pointer_t pInstance;
 
@@ -49,7 +49,7 @@ protected:
 public:
     static Pointer_t Instance();
 
-    string operator()(Id qName);
+    std::string operator()(Id qName);
 };
 
 class SprmIdToString
@@ -58,7 +58,7 @@ class SprmIdToString
 
     static Pointer_t pInstance;
 
-    std::map<sal_uInt32, string> mMap;
+    std::map<sal_uInt32, std::string> mMap;
 
 protected:
     /**
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 62e8f7821c20..24b8ac1f1548 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -64,7 +64,7 @@ namespace writerfilter
 
 #ifdef DEBUG_DOMAINMAPPER
         void element(const std::string & name);
-        void unoPropertySet(uno::Reference<beans::XPropertySet> rPropSet);
+        void unoPropertySet(css::uno::Reference<css::beans::XPropertySet> rPropSet);
 #endif
 #if OSL_DEBUG_LEVEL > 1
         void startElement(const std::string & name);
@@ -73,7 +73,7 @@ namespace writerfilter
 #if OSL_DEBUG_LEVEL > 1
         void attribute(const std::string & name, const OUString & value);
         void attribute(const std::string & name, sal_uInt32 value);
-        void attribute(const std::string & name, const uno::Any aAny);
+        void attribute(const std::string & name, const css::uno::Any aAny);
         void chars(const std::string & chars);
         void chars(const OUString & chars);
         void endElement();
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 75bacb85f3c4..0d3634276e70 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -55,8 +55,6 @@
 typedef sal_uInt32 Id;
 
 namespace writerfilter {
-using namespace ::com::sun::star;
-using namespace ::std;
 
 /**
     Reference to an resource that generates events and sends them to a
@@ -103,7 +101,7 @@ public:
     /**
        Returns the type of the reference aka the name of the access class.
      */
-    virtual string getType() const = 0;
+    virtual std::string getType() const = 0;
 
 protected:
     ~Reference() {}
@@ -277,7 +275,7 @@ public:
 
        @param info     the information
      */
-    virtual void info(const string & info) = 0;
+    virtual void info(const std::string & info) = 0;
 
 protected:
     ~Stream() {}
@@ -297,7 +295,7 @@ public:
        Pointer to a value.
      */
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    typedef auto_ptr<Value> Pointer_t;
+    typedef std::auto_ptr<Value> Pointer_t;
     SAL_WNODEPRECATED_DECLARATIONS_POP
 
     virtual ~Value() {}
@@ -315,7 +313,7 @@ public:
     /**
        Returns representation of the value as uno::Any.
      */
-    virtual uno::Any getAny() const = 0;
+    virtual css::uno::Any getAny() const = 0;
 
     /**
        Returns properties of this value.
@@ -335,7 +333,7 @@ public:
     /**
        Returns string representation of this value.
      */
-    virtual string toString() const = 0;
+    virtual std::string toString() const = 0;
 };
 
 /**
@@ -346,7 +344,7 @@ class Sprm
 {
 public:
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    typedef auto_ptr<Sprm> Pointer_t;
+    typedef std::auto_ptr<Sprm> Pointer_t;
     SAL_WNODEPRECATED_DECLARATIONS_POP
     enum Kind { UNKNOWN, CHARACTER, PARAGRAPH, TABLE };
 
@@ -384,12 +382,12 @@ public:
     /**
        Returns name of sprm.
     */
-    virtual string getName() const = 0;
+    virtual std::string getName() const = 0;
 
     /**
        Returns string repesentation of sprm.
      */
-    virtual string toString() const = 0;
+    virtual std::string toString() const = 0;
 
 protected:
     ~Sprm() {}