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

Change-Id: I2196a1df09a6f35e4de3ab3cc84bc1e149cd8f61

38 files changed, 213 insertions, 206 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() {}
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 4a210ac70ec4..b0160395432b 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -57,7 +57,7 @@ private:
     bool                                        m_aFilledLines[BORDER_COUNT];
     ::com::sun::star::table::BorderLine2        m_aBorderLines[BORDER_COUNT];
     OUString m_aInteropGrabBagName;
-    std::vector<beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
     void appendGrabBag(const OUString& aKey, const OUString& aValue);
 
     // Properties
@@ -73,7 +73,7 @@ public:
     sal_Int32                                   getLineDistance() const { return m_nLineDistance;}
     bool                                        getShadow();
     void enableInteropGrabBag(const OUString& aName);
-    beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
+    css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
 };
 typedef boost::shared_ptr< BorderHandler >          BorderHandlerPtr;
 }}
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index c069b4b6f315..91e758f043b1 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -29,11 +29,11 @@
 namespace writerfilter {
 namespace dmapper {
 
-using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star;
 
 CellColorHandler::CellColorHandler() :
 LoggedProperties(dmapper_logger, "CellColorHandler"),
-m_nShadingPattern( ShadingPattern::CLEAR ),
+m_nShadingPattern( drawing::ShadingPattern::CLEAR ),
 m_nColor( 0xffffffff ),
 m_nFillColor( 0xffffffff ),
     m_OutputFormat( Form )
@@ -255,68 +255,68 @@ TablePropertyMapPtr  CellColorHandler::getProperties()
     {
         static sal_Int32 aWWShadingPatterns[ ] =
         {
-            ShadingPattern::CLEAR,
-            ShadingPattern::SOLID,
-            ShadingPattern::PCT5,
-            ShadingPattern::PCT10,
-            ShadingPattern::PCT20,
-            ShadingPattern::PCT25,
-            ShadingPattern::PCT30,
-            ShadingPattern::PCT40,
-            ShadingPattern::PCT50,
-            ShadingPattern::PCT60,
-            ShadingPattern::PCT70,
-            ShadingPattern::PCT75,
-            ShadingPattern::PCT80,
-            ShadingPattern::PCT90,
-            ShadingPattern::HORZ_STRIPE,
-            ShadingPattern::VERT_STRIPE,
-            ShadingPattern::REVERSE_DIAG_STRIPE,
-            ShadingPattern::DIAG_STRIPE,
-            ShadingPattern::HORZ_CROSS,
-            ShadingPattern::DIAG_CROSS,
-            ShadingPattern::THIN_HORZ_STRIPE,
-            ShadingPattern::THIN_VERT_STRIPE,
-            ShadingPattern::THIN_REVERSE_DIAG_STRIPE,
-            ShadingPattern::THIN_DIAG_STRIPE,
-            ShadingPattern::THIN_HORZ_CROSS,
-            ShadingPattern::THIN_DIAG_CROSS,
-            ShadingPattern::UNUSED_1,
-            ShadingPattern::UNUSED_2,
-            ShadingPattern::UNUSED_3,
-            ShadingPattern::UNUSED_4,
-            ShadingPattern::UNUSED_5,
-            ShadingPattern::UNUSED_6,
-            ShadingPattern::UNUSED_7,
-            ShadingPattern::UNUSED_8,
-            ShadingPattern::UNUSED_9,
-            ShadingPattern::PCT2,
-            ShadingPattern::PCT7,
-            ShadingPattern::PCT12,
-            ShadingPattern::PCT15,
-            ShadingPattern::PCT17,
-            ShadingPattern::PCT22,
-            ShadingPattern::PCT27,
-            ShadingPattern::PCT32,
-            ShadingPattern::PCT35,
-            ShadingPattern::PCT37,
-            ShadingPattern::PCT42,
-            ShadingPattern::PCT45,
-            ShadingPattern::PCT47,
-            ShadingPattern::PCT52,
-            ShadingPattern::PCT55,
-            ShadingPattern::PCT57,
-            ShadingPattern::PCT62,
-            ShadingPattern::PCT65,
-            ShadingPattern::PCT67,
-            ShadingPattern::PCT72,
-            ShadingPattern::PCT77,
-            ShadingPattern::PCT82,
-            ShadingPattern::PCT85,
-            ShadingPattern::PCT87,
-            ShadingPattern::PCT92,
-            ShadingPattern::PCT95,
-            ShadingPattern::PCT97
+            drawing::ShadingPattern::CLEAR,
+            drawing::ShadingPattern::SOLID,
+            drawing::ShadingPattern::PCT5,
+            drawing::ShadingPattern::PCT10,
+            drawing::ShadingPattern::PCT20,
+            drawing::ShadingPattern::PCT25,
+            drawing::ShadingPattern::PCT30,
+            drawing::ShadingPattern::PCT40,
+            drawing::ShadingPattern::PCT50,
+            drawing::ShadingPattern::PCT60,
+            drawing::ShadingPattern::PCT70,
+            drawing::ShadingPattern::PCT75,
+            drawing::ShadingPattern::PCT80,
+            drawing::ShadingPattern::PCT90,
+            drawing::ShadingPattern::HORZ_STRIPE,
+            drawing::ShadingPattern::VERT_STRIPE,
+            drawing::ShadingPattern::REVERSE_DIAG_STRIPE,
+            drawing::ShadingPattern::DIAG_STRIPE,
+            drawing::ShadingPattern::HORZ_CROSS,
+            drawing::ShadingPattern::DIAG_CROSS,
+            drawing::ShadingPattern::THIN_HORZ_STRIPE,
+            drawing::ShadingPattern::THIN_VERT_STRIPE,
+            drawing::ShadingPattern::THIN_REVERSE_DIAG_STRIPE,
+            drawing::ShadingPattern::THIN_DIAG_STRIPE,
+            drawing::ShadingPattern::THIN_HORZ_CROSS,
+            drawing::ShadingPattern::THIN_DIAG_CROSS,
+            drawing::ShadingPattern::UNUSED_1,
+            drawing::ShadingPattern::UNUSED_2,
+            drawing::ShadingPattern::UNUSED_3,
+            drawing::ShadingPattern::UNUSED_4,
+            drawing::ShadingPattern::UNUSED_5,
+            drawing::ShadingPattern::UNUSED_6,
+            drawing::ShadingPattern::UNUSED_7,
+            drawing::ShadingPattern::UNUSED_8,
+            drawing::ShadingPattern::UNUSED_9,
+            drawing::ShadingPattern::PCT2,
+            drawing::ShadingPattern::PCT7,
+            drawing::ShadingPattern::PCT12,
+            drawing::ShadingPattern::PCT15,
+            drawing::ShadingPattern::PCT17,
+            drawing::ShadingPattern::PCT22,
+            drawing::ShadingPattern::PCT27,
+            drawing::ShadingPattern::PCT32,
+            drawing::ShadingPattern::PCT35,
+            drawing::ShadingPattern::PCT37,
+            drawing::ShadingPattern::PCT42,
+            drawing::ShadingPattern::PCT45,
+            drawing::ShadingPattern::PCT47,
+            drawing::ShadingPattern::PCT52,
+            drawing::ShadingPattern::PCT55,
+            drawing::ShadingPattern::PCT57,
+            drawing::ShadingPattern::PCT62,
+            drawing::ShadingPattern::PCT65,
+            drawing::ShadingPattern::PCT67,
+            drawing::ShadingPattern::PCT72,
+            drawing::ShadingPattern::PCT77,
+            drawing::ShadingPattern::PCT82,
+            drawing::ShadingPattern::PCT85,
+            drawing::ShadingPattern::PCT87,
+            drawing::ShadingPattern::PCT92,
+            drawing::ShadingPattern::PCT95,
+            drawing::ShadingPattern::PCT97
         };
 
         // Write the shading pattern property
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index b69ed3bde99b..d909d85d01a2 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -40,13 +40,13 @@ private:
     OutputFormat m_OutputFormat;
 
     OUString m_aInteropGrabBagName;
-    std::vector<beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
     virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
 
-    void createGrabBag(const OUString& aName, uno::Any aValue);
+    void createGrabBag(const OUString& aName, css::uno::Any aValue);
 
 public:
     CellColorHandler( );
@@ -57,7 +57,7 @@ public:
     void setOutputFormat( OutputFormat format ) { m_OutputFormat = format; }
 
     void enableInteropGrabBag(const OUString& aName);
-    beans::PropertyValue getInteropGrabBag();
+    css::beans::PropertyValue getInteropGrabBag();
     void disableInteropGrabBag();
     bool isInteropGrabBagEnabled();
 };
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 3e7438433124..6a59b8459530 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -36,7 +36,7 @@ private:
     sal_Int32   m_nType; ///< Unit of the value (dxa, etc).
 
     OUString m_aInteropGrabBagName;
-    std::vector<beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
@@ -61,7 +61,7 @@ public:
     ::boost::shared_ptr<TablePropertyMap>            getProperties();
 
     void enableInteropGrabBag(const OUString& aName);
-    beans::PropertyValue getInteropGrabBag();
+    css::beans::PropertyValue getInteropGrabBag();
 
 };
 typedef boost::shared_ptr< CellMarginHandler >          CellMarginHandlerPtr;
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index ec2d7c758612..ace3c7188a63 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -29,6 +29,8 @@
 
 #include "dmapperLoggers.hxx"
 
+using namespace com::sun::star;
+
 namespace writerfilter {
 namespace dmapper
 {
@@ -213,7 +215,7 @@ void FontTable::lcl_substream(Id, ::writerfilter::Reference<Stream>::Pointer_t)
 {
 }
 
-void FontTable::lcl_info(const string& )
+void FontTable::lcl_info(const std::string& )
 {
 }
 
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index eabf64ff18e0..bd1182519194 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -88,7 +88,7 @@ class FontTable : public LoggedProperties, public LoggedTable
                            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;
     virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) SAL_OVERRIDE;
     virtual void lcl_endShape( ) SAL_OVERRIDE;
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index d71f59faa9bc..6a41abfb53b4 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -73,10 +73,10 @@ typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
 class GraphicZOrderHelper
 {
 public:
-    void addItem( uno::Reference< beans::XPropertySet > props, sal_Int32 relativeHeight );
+    void addItem( css::uno::Reference< css::beans::XPropertySet > props, sal_Int32 relativeHeight );
     sal_Int32 findZOrder( sal_Int32 relativeHeight, bool bOldStyle = false );
 private:
-    typedef std::map< sal_Int32, uno::Reference< beans::XPropertySet > > Items;
+    typedef std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > Items;
     Items items;
 };
 
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 540724b73588..21612c060de3 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -116,7 +116,7 @@ public:
     virtual void lcl_table(Id name,
                            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;
     virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE;
     virtual void lcl_endShape() SAL_OVERRIDE;
 
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 1e7e82de89c7..b7c412849842 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -23,7 +23,7 @@ namespace dmapper
 class LatentStyleHandler
     : public LoggedProperties
 {
-    std::vector<beans::PropertyValue> m_aAttributes;
+    std::vector<css::beans::PropertyValue> m_aAttributes;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 5df5cb6edfa1..8a52e7007ccd 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -38,7 +38,7 @@ class MeasureHandler : public LoggedProperties
     sal_Int16 m_nRowHeightSizeType; //table row height type
 
     OUString m_aInteropGrabBagName;
-    std::vector<beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
@@ -55,7 +55,7 @@ public:
 
     sal_Int16 GetRowHeightSizeType() const { return m_nRowHeightSizeType;}
     void enableInteropGrabBag(const OUString& aName);
-    beans::PropertyValue getInteropGrabBag();
+    css::beans::PropertyValue getInteropGrabBag();
 };
 typedef boost::shared_ptr
     < MeasureHandler >  MeasureHandlerPtr;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 84a751a1d341..71a6e66511a4 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -181,7 +181,7 @@ private:
     AbstractListDef::Pointer             m_pAbstractDef;
 
     // Cache for the UNO numbering rules
-    uno::Reference< container::XIndexReplace > m_xNumRules;
+    css::uno::Reference< css::container::XIndexReplace > m_xNumRules;
 
 public:
     typedef boost::shared_ptr< ListDef > Pointer;
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index f4c68588fdb6..a3a6325e7387 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -52,7 +52,7 @@ private:
     // See implementation of SectionPropertyMap::ApplyBorderToPageStyles
     sal_Int32 m_nDisplay;
     sal_Int32 m_nOffset;
-    vector<_PgBorder> m_aBorders;
+    std::vector<_PgBorder> m_aBorders;
 
     // Properties
     virtual void lcl_attribute( Id eName, Value& rVal ) SAL_OVERRIDE;
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 571181fee319..6977fff8a0e1 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -73,18 +73,18 @@ enum GrabBagType
 
 class PropValue
 {
-    uno::Any m_aValue;
+    css::uno::Any m_aValue;
     GrabBagType m_rGrabBagType;
 
 public:
-    PropValue(const uno::Any& rValue, GrabBagType rGrabBagType = NO_GRAB_BAG) :
+    PropValue(const css::uno::Any& rValue, GrabBagType rGrabBagType = NO_GRAB_BAG) :
         m_aValue(rValue), m_rGrabBagType(rGrabBagType) {}
 
     PropValue() : m_aValue(), m_rGrabBagType(NO_GRAB_BAG) {}
 
     PropValue& operator=(const PropValue& rProp) { m_aValue = rProp.m_aValue; m_rGrabBagType = rProp.m_rGrabBagType; return *this; }
 
-    const uno::Any& getValue() const { return m_aValue; }
+    const css::uno::Any& getValue() const { return m_aValue; }
     bool hasGrabBag() const { return m_rGrabBagType != NO_GRAB_BAG; }
     GrabBagType getGrabBagType() const { return m_rGrabBagType; }
 };
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 43190dcf3295..ed81f0701cbc 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -27,15 +27,15 @@ namespace dmapper
 {
 
 void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger,
-        const uno::Any & rTableColumnSeparators);
+        const css::uno::Any & rTableColumnSeparators);
 void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger,
-        beans::PropertyValues & rValues);
+        css::beans::PropertyValues & rValues);
 
-typedef uno::Sequence<beans::PropertyValues> PropertyValueSeq_t;
+typedef css::uno::Sequence<css::beans::PropertyValues> PropertyValueSeq_t;
 void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger,
      PropertyValueSeq_t & rPropValSeq);
 
-typedef uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t;
+typedef css::uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t;
 void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger,
         PropertyValueSeqSeq_t & rPropValSeqSeq);
 }
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 9c44fd2858b1..24544a413348 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -27,6 +27,8 @@
 
 #include "dmapperLoggers.hxx"
 
+using namespace com::sun::star;
+
 namespace writerfilter {
 
 using resourcemodel::resolveSprmProps;
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 982a29b1ebf1..0bfd7b4176a5 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -74,11 +74,11 @@ class SettingsTable : public LoggedProperties, public LoggedTable
     bool GetSplitPgBreakAndParaMark() const;
     bool GetMirrorMarginSettings() const;
 
-    uno::Sequence<beans::PropertyValue> GetThemeFontLangProperties() const;
+    css::uno::Sequence<css::beans::PropertyValue> GetThemeFontLangProperties() const;
 
-    uno::Sequence<beans::PropertyValue> GetCompatSettings() const;
+    css::uno::Sequence<css::beans::PropertyValue> GetCompatSettings() const;
 
-    void ApplyProperties( uno::Reference< text::XTextDocument > xDoc );
+    void ApplyProperties( css::uno::Reference< css::text::XTextDocument > xDoc );
 
  private:
     // Properties
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 583e20def643..abc9ac03c671 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -62,7 +62,7 @@ private:
     bool                                                m_bOOXML;
 
     OUString m_aInteropGrabBagName;
-    std::vector<beans::PropertyValue> m_aInteropGrabBag;
+    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
     void appendGrabBag(const OUString& aKey, const OUString& aValue);
 
     void localResolve(Id Name, writerfilter::Reference<Properties>::Pointer_t pProperties);
@@ -80,7 +80,7 @@ public:
     ::boost::shared_ptr<PropertyMap>            getRowProperties() const;
     sal_Int32                                   getTableWidth() const;
     void enableInteropGrabBag(const OUString& aName);
-    beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
+    css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
     static OUString getBorderTypeString(sal_Int32 nType);
     static OUString getThemeColorTypeString(sal_Int32 nType);
 };
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 7c1aa2403d5e..fa19d0d2dd1f 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -25,8 +25,7 @@ namespace dmapper
 
 using namespace std;
 using namespace oox;
-using namespace css::uno;
-using namespace css::beans;
+using namespace com::sun::star;
 
 namespace
 {
@@ -576,7 +575,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
         case NS_ooxml::LN_CT_Shadow_algn:
         case NS_ooxml::LN_CT_Reflection_algn:
             {
-                uno::Any aAny = makeAny(getRectAlignmentString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getRectAlignmentString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("algn", aAny);
             }
             break;
@@ -585,19 +584,19 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_TextOutlineEffect_cap:
             {
-                uno::Any aAny = makeAny(getLineCapString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getLineCapString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("cap", aAny);
             }
             break;
         case NS_ooxml::LN_CT_TextOutlineEffect_cmpd:
             {
-                uno::Any aAny = makeAny(getCompoundLineString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getCompoundLineString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("cmpd", aAny);
             }
             break;
         case NS_ooxml::LN_CT_TextOutlineEffect_algn:
             {
-                uno::Any aAny = makeAny(getPenAlignmentString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getPenAlignmentString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("algn", aAny);
             }
             break;
@@ -609,13 +608,13 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_LinearShadeProperties_scaled:
             {
-                uno::Any aAny = makeAny(getOnOffString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getOnOffString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("scaled", aAny);
             }
             break;
         case NS_ooxml::LN_CT_PathShadeProperties_path:
             {
-                uno::Any aAny = makeAny(getPathShadeTypeString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getPathShadeTypeString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("path", aAny);
             }
             break;
@@ -633,7 +632,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_PresetLineDashProperties_val:
             {
-                uno::Any aAny = makeAny(getPresetLineDashValString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getPresetLineDashValString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("val", aAny);
             }
             break;
@@ -642,19 +641,19 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_Camera_prst:
             {
-                uno::Any aAny = makeAny(getPresetCameraTypeString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getPresetCameraTypeString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("prst", aAny);
             }
             break;
         case NS_ooxml::LN_CT_LightRig_rig:
             {
-                uno::Any aAny = makeAny(getLightRigTypeString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getLightRigTypeString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("rig", aAny);
             }
             break;
         case NS_ooxml::LN_CT_LightRig_dir:
             {
-                uno::Any aAny = makeAny(getLightRigDirectionString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getLightRigDirectionString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("dir", aAny);
             }
             break;
@@ -675,7 +674,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_Props3D_prstMaterial:
             {
-                uno::Any aAny = makeAny(getPresetMaterialTypeString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getPresetMaterialTypeString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("prstMaterial", aAny);
             }
             break;
@@ -687,25 +686,25 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
             break;
         case NS_ooxml::LN_CT_Bevel_prst:
             {
-                uno::Any aAny = makeAny(getBevelPresetTypeString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getBevelPresetTypeString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("prst", aAny);
             }
             break;
         case NS_ooxml::LN_CT_Ligatures_val:
             {
-                uno::Any aAny = makeAny(getLigaturesString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getLigaturesString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("val", aAny);
             }
             break;
         case NS_ooxml::LN_CT_NumForm_val:
             {
-                uno::Any aAny = makeAny(getNumFormString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getNumFormString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("val", aAny);
             }
             break;
         case NS_ooxml::LN_CT_NumSpacing_val:
             {
-                uno::Any aAny = makeAny(getNumSpacingString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getNumSpacingString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("val", aAny);
             }
             break;
@@ -715,7 +714,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
         case NS_ooxml::LN_CT_StyleSet_val:
         case NS_ooxml::LN_CT_OnOff_val:
             {
-                uno::Any aAny = makeAny(getOnOffString(sal_Int32(aValue.getInt())));
+                uno::Any aAny = uno::makeAny(getOnOffString(sal_Int32(aValue.getInt())));
                 mpGrabBagStack->appendElement("val", aAny);
             }
             break;
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 406a2bc2b09f..2cc35665a8a6 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -25,6 +25,8 @@
 #include <resourcemodel/QNameToString.hxx>
 #endif
 
+using namespace com::sun::star;
+
 namespace writerfilter {
 namespace dmapper
 {
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index e55216bb3815..58b55b765af7 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -42,7 +42,7 @@ public:
 
     const OUString getFontNameForTheme(const Id id) const;
     static OUString getStringForTheme(const Id id);
-    void setThemeFontLangProperties(const uno::Sequence<beans::PropertyValue>& aPropSeq);
+    void setThemeFontLangProperties(const css::uno::Sequence<css::beans::PropertyValue>& aPropSeq);
 
  private:
     // Properties
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
index 3945a4861bc2..c98cf6f0c264 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
@@ -70,7 +70,7 @@ void OOXMLBinaryObjectReference::resolve(BinaryObj & rHandler)
                   mSequence.getLength(), pRef);
 }
 
-string OOXMLBinaryObjectReference::getType() const
+std::string OOXMLBinaryObjectReference::getType() const
 {
     return "OOXMLBinaryObjectReference";
 }
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
index daf076146f1d..69a4c3ff4bb4 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
@@ -40,7 +40,7 @@ public:
 
     virtual void resolve(BinaryObj & rHandler) SAL_OVERRIDE;
 
-    virtual string getType() const SAL_OVERRIDE;
+    virtual std::string getType() const SAL_OVERRIDE;
 };
 }}
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 43967e8fad38..390e661cacc7 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -97,7 +97,7 @@ public:
 
     virtual void resolve(Stream & rStream) SAL_OVERRIDE;
 
-    virtual string getType() const SAL_OVERRIDE;
+    virtual std::string getType() const SAL_OVERRIDE;
 
     virtual void resolveFootnote(Stream & rStream,
                                  const Id & rType,
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 67099a822b29..76ac56ab58f8 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -37,8 +37,8 @@ public:
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE = 0;
     virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE = 0;
     virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE = 0;
-    virtual string getName() const SAL_OVERRIDE = 0;
-    virtual string toString() const SAL_OVERRIDE = 0;
+    virtual std::string getName() const SAL_OVERRIDE = 0;
+    virtual std::string toString() const SAL_OVERRIDE = 0;
     virtual void resolve(Properties & rProperties) = 0;
 
     virtual Sprm * clone() = 0;
@@ -52,13 +52,13 @@ public:
     virtual ~OOXMLPropertySet();
 
     virtual void resolve(Properties & rHandler) SAL_OVERRIDE = 0;
-    virtual string getType() const SAL_OVERRIDE = 0;
+    virtual std::string getType() const SAL_OVERRIDE = 0;
     virtual void add(OOXMLProperty::Pointer_t pProperty) = 0;
     virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) = 0;
     virtual OOXMLPropertySet * clone() const = 0;
-    virtual void setType(const string & rsType) = 0;
+    virtual void setType(const std::string & rsType) = 0;
 
-    virtual string toString() = 0;
+    virtual std::string toString() = 0;
 };
 
 class OOXMLTable : public writerfilter::Reference<Table>
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 0808fb8735e1..bdff38ae1ebc 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -27,7 +27,7 @@ namespace writerfilter
 #ifdef DEBUG_LOGGING
 // class: LoggedResourcesHelper
 
-LoggedResourcesHelper::LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix)
+LoggedResourcesHelper::LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const std::string & sPrefix)
 : mpLogger(pLogger), msPrefix(sPrefix)
 {
 }
@@ -36,12 +36,12 @@ LoggedResourcesHelper::~LoggedResourcesHelper()
 {
 }
 
-void LoggedResourcesHelper::startElement(const string & sElement)
+void LoggedResourcesHelper::startElement(const std::string & sElement)
 {
     mpLogger->startElement(msPrefix + "." + sElement);
 }
 
-void LoggedResourcesHelper::endElement(const string & /*sElement*/)
+void LoggedResourcesHelper::endElement(const std::string & /*sElement*/)
 {
     mpLogger->endElement();
 }
@@ -51,17 +51,17 @@ void LoggedResourcesHelper::chars(const OUString & rChars)
     mpLogger->chars(rChars);
 }
 
-void LoggedResourcesHelper::chars(const string & rChars)
+void LoggedResourcesHelper::chars(const std::string & rChars)
 {
     mpLogger->chars(rChars);
 }
 
-void LoggedResourcesHelper::attribute(const string & rName, const string & rValue)
+void LoggedResourcesHelper::attribute(const std::string & rName, const std::string & rValue)
 {
     mpLogger->attribute(rName, rValue);
 }
 
-void LoggedResourcesHelper::attribute(const string & rName, sal_uInt32 nValue)
+void LoggedResourcesHelper::attribute(const std::string & rName, sal_uInt32 nValue)
 {
     mpLogger->attribute(rName, nValue);
 }
@@ -73,11 +73,11 @@ void LoggedResourcesHelper::attribute(const string & rName, sal_uInt32 nValue)
 LoggedStream::LoggedStream(
 #ifdef DEBUG_LOGGING
     TagLogger::Pointer_t pLogger,
-    const string & sPrefix
+    const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
 #else
     TagLogger::Pointer_t,
-    const string&
+    const std::string&
 )
 #endif
 {
@@ -257,7 +257,7 @@ void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t
 #endif
 }
 
-void LoggedStream::info(const string & _info)
+void LoggedStream::info(const std::string & _info)
 {
 #ifdef DEBUG_LOGGING
     mHelper.startElement("info");
@@ -275,11 +275,11 @@ void LoggedStream::info(const string & _info)
 LoggedProperties::LoggedProperties(
 #ifdef DEBUG_LOGGING
     TagLogger::Pointer_t pLogger,
-    const string & sPrefix
+    const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
 #else
     TagLogger::Pointer_t,
-    const string&
+    const std::string&
 )
 #endif
 {
@@ -319,11 +319,11 @@ void LoggedProperties::sprm(Sprm & rSprm)
 LoggedTable::LoggedTable(
 #ifdef DEBUG_LOGGING
     TagLogger::Pointer_t pLogger,
-    const string & sPrefix
+    const std::string & sPrefix
 ) : mHelper(pLogger, sPrefix)
 #else
     TagLogger::Pointer_t,
-    const string&
+    const std::string&
 )
 #endif
 {
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index f5d99d59d8e3..f4b45bc00357 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -33,14 +33,14 @@ QNameToString::Pointer_t QNameToString::Instance()
 }
 
 #ifdef DEBUG_LOGGING
-string QNameToString::operator()(Id qName)
+std::string QNameToString::operator()(Id qName)
 {
     Map::const_iterator aIt = mMap.find(qName);
 
     if (aIt != mMap.end())
         return aIt->second;
 
-    return string();
+    return std::string();
 }
 #endif
 
diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
index 8771295ffb13..63cf33f42aab 100644
--- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
@@ -14,11 +14,11 @@ namespace writerfilter
 namespace rtftok
 {
 
-RTFDocument::Pointer_t RTFDocumentFactory::createDocument(uno::Reference< uno::XComponentContext > const& xContext,
-        uno::Reference< io::XInputStream > const& xInputStream,
-        uno::Reference< lang::XComponent > const& xDstDoc,
-        uno::Reference< frame::XFrame > const& xFrame,
-        uno::Reference< task::XStatusIndicator > const& xStatusIndicator)
+RTFDocument::Pointer_t RTFDocumentFactory::createDocument(css::uno::Reference< css::uno::XComponentContext > const& xContext,
+        css::uno::Reference< css::io::XInputStream > const& xInputStream,
+        css::uno::Reference< css::lang::XComponent > const& xDstDoc,
+        css::uno::Reference< css::frame::XFrame > const& xFrame,
+        css::uno::Reference< css::task::XStatusIndicator > const& xStatusIndicator)
 {
     return RTFDocument::Pointer_t(new RTFDocumentImpl(xContext, xInputStream, xDstDoc, xFrame, xStatusIndicator));
 }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 616e3ae77c78..3c7d2f318008 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -143,9 +143,9 @@ class RTFDrawingObject : public RTFShape
 {
 public:
     RTFDrawingObject();
-    uno::Reference<drawing::XShape> xShape;
-    uno::Reference<beans::XPropertySet> xPropertySet;
-    std::vector<beans::PropertyValue> aPendingProperties;
+    css::uno::Reference<css::drawing::XShape> xShape;
+    css::uno::Reference<css::beans::XPropertySet> xPropertySet;
+    std::vector<css::beans::PropertyValue> aPendingProperties;
     sal_uInt8 nLineColorR, nLineColorG, nLineColorB;
     bool bHasLineColor;
     sal_uInt8 nFillColorR, nFillColorG, nFillColorB;
@@ -153,7 +153,7 @@ public:
     sal_Int32 nDhgt;
     sal_Int32 nFLine;
     sal_Int32 nPolyLineCount;
-    uno::Sequence<awt::Point> aPolyLinePoints;
+    css::uno::Sequence<css::awt::Point> aPolyLinePoints;
     bool bHadShapeText;
 };
 
@@ -313,11 +313,11 @@ class RTFDocumentImpl
 {
 public:
     typedef ::boost::shared_ptr<RTFDocumentImpl> Pointer_t;
-    RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& xContext,
-                    uno::Reference<io::XInputStream> const& xInputStream,
-                    uno::Reference<lang::XComponent> const& xDstDoc,
-                    uno::Reference<frame::XFrame> const& xFrame,
-                    uno::Reference<task::XStatusIndicator> const& xStatusIndicator);
+    RTFDocumentImpl(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+                    css::uno::Reference<css::io::XInputStream> const& xInputStream,
+                    css::uno::Reference<css::lang::XComponent> const& xDstDoc,
+                    css::uno::Reference<css::frame::XFrame> const& xFrame,
+                    css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator);
     virtual ~RTFDocumentImpl();
 
     // RTFDocument
@@ -350,7 +350,7 @@ public:
     void setAuthorInitials(OUString& rAuthorInitials);
     void setIgnoreFirst(OUString& rIgnoreFirst);
     void seek(sal_Size nPos);
-    uno::Reference<lang::XMultiServiceFactory> getModelFactory();
+    css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory();
     bool isInBackground();
     void setDestinationText(OUString& rString);
     /// Resolve a picture: If not inline, then anchored.
@@ -421,13 +421,13 @@ private:
     void backupTableRowProperties();
     void restoreTableRowProperties();
 
-    uno::Reference<uno::XComponentContext> const& m_xContext;
-    uno::Reference<io::XInputStream> const& m_xInputStream;
-    uno::Reference<lang::XComponent> const& m_xDstDoc;
-    uno::Reference<frame::XFrame> const& m_xFrame;
-    uno::Reference<task::XStatusIndicator> const& m_xStatusIndicator;
-    uno::Reference<lang::XMultiServiceFactory> m_xModelFactory;
-    uno::Reference<document::XDocumentProperties> m_xDocumentProperties;
+    css::uno::Reference<css::uno::XComponentContext> const& m_xContext;
+    css::uno::Reference<css::io::XInputStream> const& m_xInputStream;
+    css::uno::Reference<css::lang::XComponent> const& m_xDstDoc;
+    css::uno::Reference<css::frame::XFrame> const& m_xFrame;
+    css::uno::Reference<css::task::XStatusIndicator> const& m_xStatusIndicator;
+    css::uno::Reference<css::lang::XMultiServiceFactory> m_xModelFactory;
+    css::uno::Reference<css::document::XDocumentProperties> m_xDocumentProperties;
     boost::shared_ptr<SvStream> m_pInStream;
     Stream* m_pMapperStream;
     boost::shared_ptr<RTFSdrImport> m_pSdrImport;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3699c0fa2301..790fd60f1e29 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -40,6 +40,8 @@
 #include <oox/drawingml/shapepropertymap.hxx>
 #include <oox/helper/propertyset.hxx>
 
+using namespace com::sun::star;
+
 namespace writerfilter
 {
 namespace rtftok
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index b7e3cb54a2fa..0d36c2b1ae82 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -22,7 +22,7 @@ namespace rtftok
 class RTFSdrImport
 {
 public:
-    RTFSdrImport(RTFDocumentImpl& rImport, uno::Reference<lang::XComponent> const& xDstDoc);
+    RTFSdrImport(RTFDocumentImpl& rImport, css::uno::Reference<css::lang::XComponent> const& xDstDoc);
     virtual ~RTFSdrImport();
 
     void resolve(RTFShape& rShape, bool bClose);
@@ -30,25 +30,25 @@ public:
     void append(const OUString& aKey, const OUString& aValue);
     /// Append property on the current parent.
     void appendGroupProperty(const OUString& aKey, const OUString& aValue);
-    void resolveDhgt(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nZOrder, bool bOldStyle);
-    void resolveFLine(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nFLine);
+    void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> xPropertySet, sal_Int32 nZOrder, bool bOldStyle);
+    void resolveFLine(css::uno::Reference<css::beans::XPropertySet> xPropertySet, sal_Int32 nFLine);
     /**
      * These are the default in Word, but not in Writer.
      *
      * @param bNew if the frame is new-style or old-style.
      */
-    std::vector<beans::PropertyValue> getTextFrameDefaults(bool bNew);
+    std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew);
     /// Push a new group shape to the parent stack.
-    void pushParent(uno::Reference<drawing::XShapes> xParent);
+    void pushParent(css::uno::Reference<css::drawing::XShapes> xParent);
     /// Pop the current group shape from the parent stack.
     void popParent();
 private:
-    void createShape(const OUString& aService, uno::Reference<drawing::XShape>& xShape, uno::Reference<beans::XPropertySet>& xPropertySet);
-    void applyProperty(uno::Reference<drawing::XShape> xShape, const OUString& aKey, const OUString& aValue);
+    void createShape(const OUString& aService, css::uno::Reference<css::drawing::XShape>& xShape, css::uno::Reference<css::beans::XPropertySet>& xPropertySet);
+    void applyProperty(css::uno::Reference<css::drawing::XShape> xShape, const OUString& aKey, const OUString& aValue);
 
     RTFDocumentImpl& m_rImport;
-    std::stack< uno::Reference<drawing::XShapes> > m_aParents;
-    uno::Reference<drawing::XShape> m_xShape;
+    std::stack< css::uno::Reference<css::drawing::XShapes> > m_aParents;
+    css::uno::Reference<css::drawing::XShape> m_xShape;
     /// If m_xShape is imported as a Writer text frame (instead of a drawinglayer rectangle).
     bool m_bTextFrame;
 };
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 430b049de554..2dbad33eed52 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -10,6 +10,8 @@
 #include <rtfreferenceproperties.hxx>
 #include <rtfdocumentimpl.hxx>
 
+using namespace com::sun::star;
+
 namespace writerfilter
 {
 namespace rtftok
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 85d9aeb6137d..210cbb5a629d 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -26,23 +26,23 @@ class RTFValue
 {
 public:
     typedef boost::shared_ptr<RTFValue> Pointer_t;
-    RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape,
-             uno::Reference<io::XInputStream> rStream, uno::Reference<embed::XEmbeddedObject> rObject, bool bForceString,
+    RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes, RTFSprms rSprms, css::uno::Reference<css::drawing::XShape> rShape,
+             css::uno::Reference<css::io::XInputStream> rStream, css::uno::Reference<css::embed::XEmbeddedObject> rObject, bool bForceString,
              RTFShape aShape);
     RTFValue();
     RTFValue(int nValue);
     RTFValue(const OUString& sValue, bool bForce = false);
     RTFValue(RTFSprms rAttributes);
     RTFValue(RTFSprms rAttributes, RTFSprms rSprms);
-    RTFValue(uno::Reference<drawing::XShape> rShape);
-    RTFValue(uno::Reference<io::XInputStream> rStream);
-    RTFValue(uno::Reference<embed::XEmbeddedObject> rObject);
+    RTFValue(css::uno::Reference<css::drawing::XShape> rShape);
+    RTFValue(css::uno::Reference<css::io::XInputStream> rStream);
+    RTFValue(css::uno::Reference<css::embed::XEmbeddedObject> rObject);
     RTFValue(RTFShape aShape);
     virtual ~RTFValue();
     void setString(const OUString& sValue);
     virtual int getInt() const SAL_OVERRIDE;
     virtual OUString getString() const SAL_OVERRIDE;
-    virtual uno::Any getAny() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
     virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
@@ -58,9 +58,9 @@ private:
     OUString m_sValue;
     boost::shared_ptr<RTFSprms> m_pAttributes;
     boost::shared_ptr<RTFSprms> m_pSprms;
-    uno::Reference<drawing::XShape> m_xShape;
-    uno::Reference<io::XInputStream> m_xStream;
-    uno::Reference<embed::XEmbeddedObject> m_xObject;
+    css::uno::Reference<css::drawing::XShape> m_xShape;
+    css::uno::Reference<css::io::XInputStream> m_xStream;
+    css::uno::Reference<css::embed::XEmbeddedObject> m_xObject;
     bool m_bForceString;
     boost::shared_ptr<RTFShape> m_pShape;
 };