writerfilter: drop remaining non-css global 'using' from headers

Change-Id: I70e5e276a084d951d73879aa2aa4f19e9d2d32f8

7 files changed, 64 insertions, 76 deletions

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index e9d81cffd4a8..f8f26384ae15 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -41,9 +41,6 @@
 namespace writerfilter {
 namespace ooxml
 {
-using namespace ::std;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::xml::sax;
 
 typedef boost::shared_ptr<Stream> StreamPointer_t;
 
@@ -555,25 +552,25 @@ public:
     bool isShapeSent( ) { return m_bShapeSent; }
 
 protected:
-    typedef uno::Reference<XFastShapeContextHandler> ShapeContextRef;
+    typedef css::uno::Reference<css::xml::sax::XFastShapeContextHandler> ShapeContextRef;
     ShapeContextRef mrShapeContext;
 
     virtual void lcl_startFastElement
     (Token_t Element,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
 
     virtual void lcl_endFastElement(Token_t Element)
-        throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
 
     virtual uno::Reference< xml::sax::XFastContextHandler >
     lcl_createFastChildContext
     (Token_t Element,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
 
     virtual void lcl_characters(const OUString & aChars)
-                throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;
+                throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE;
 
 };
 
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 429b508a5242..2f10ff7760ae 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -27,23 +27,20 @@ namespace writerfilter {
 
 namespace ooxml
 {
-using namespace ::std;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::xml::sax;
 
 template <class T>
 class OOXMLFastHelper
 {
 public:
-    static uno::Reference<XFastContextHandler> createAndSetParent
+    static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParent
     (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId);
 
-    static uno::Reference<XFastContextHandler> createAndSetParentAndDefine
+    static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParentAndDefine
     (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine);
 
-    static uno::Reference<XFastContextHandler> createAndSetParentRef
+    static css::uno::Reference<css::xml::sax::XFastContextHandler> createAndSetParentRef
     (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
-     const uno::Reference < xml::sax::XFastAttributeList > & Attribs);
+     const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs);
 
     static void newProperty(OOXMLFastContextHandler * pHandler,
                             Id nId,
@@ -54,11 +51,11 @@ public:
 
     static void attributes
     (OOXMLFastContextHandler * pContext,
-     const uno::Reference < xml::sax::XFastAttributeList > & Attribs);
+     const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs);
 };
 
 template <class T>
-uno::Reference<XFastContextHandler>
+uno::Reference<css::xml::sax::XFastContextHandler>
 OOXMLFastHelper<T>::createAndSetParent
 (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId)
 {
@@ -85,13 +82,13 @@ OOXMLFastHelper<T>::createAndSetParent
     debug_logger->endElement("helper.createAndSetParent");
 #endif
 
-    uno::Reference<XFastContextHandler> aResult(pTmp);
+    css::uno::Reference<css::xml::sax::XFastContextHandler> aResult(pTmp);
 
     return aResult;
 }
 
 template <class T>
-uno::Reference<XFastContextHandler>
+uno::Reference<css::xml::sax::XFastContextHandler>
 OOXMLFastHelper<T>::createAndSetParentAndDefine
 (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine)
 {
@@ -120,16 +117,16 @@ OOXMLFastHelper<T>::createAndSetParentAndDefine
     debug_logger->endElement("helper.createAndSetParentAndDefine");
 #endif
 
-    uno::Reference<XFastContextHandler> aResult(pTmp);
+    css::uno::Reference<css::xml::sax::XFastContextHandler> aResult(pTmp);
 
     return aResult;
 }
 
 template <class T>
-uno::Reference<XFastContextHandler>
+uno::Reference<css::xml::sax::XFastContextHandler>
 OOXMLFastHelper<T>::createAndSetParentRef
 (OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
- const uno::Reference < xml::sax::XFastAttributeList > & Attribs)
+ const css::uno::Reference < css::xml::sax::XFastAttributeList > & Attribs)
 {
 #ifdef DEBUG_HELPER
     debug_logger->startElement("helper.createAndSetParentRef");
@@ -139,7 +136,7 @@ OOXMLFastHelper<T>::createAndSetParentRef
 
     boost::shared_ptr<OOXMLFastContextHandler> pTmp(new T(pHandler));
 
-    uno::Reference<XFastContextHandler> xChild =
+    css::uno::Reference<css::xml::sax::XFastContextHandler> xChild =
         pTmp->createFastChildContext(nToken, Attribs);
 
     if (xChild.is())
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 235e089b0db0..aa08c79cd4db 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -99,7 +99,7 @@ bool OOXMLParserState::isForwardEvents() const
     return mbForwardEvents;
 }
 
-const string OOXMLParserState::getHandle() const
+const std::string OOXMLParserState::getHandle() const
 {
     char sBuffer[256];
 
@@ -306,7 +306,7 @@ void OOXMLParserState::dumpXml( const TagLogger::Pointer_t& pLogger )
 {
     pLogger->startElement("parserstate");
 
-    string sTmp;
+    std::string sTmp;
 
     if (isInSectionGroup())
         sTmp += "s";
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 72f8f3978e74..d7f6005cedd0 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -32,8 +32,6 @@ namespace writerfilter {
 namespace ooxml
 {
 
-using ::std::stack;
-
 class OOXMLParserState
 {
     bool mbInSectionGroup;
@@ -46,9 +44,9 @@ class OOXMLParserState
     OOXMLDocumentImpl* mpDocument;
     OUString msTarget;
     OOXMLPropertySet::Pointer_t mpCharacterProps;
-    stack<OOXMLPropertySet::Pointer_t> mCellProps;
-    stack<OOXMLPropertySet::Pointer_t> mRowProps;
-    stack<OOXMLPropertySet::Pointer_t> mTableProps;
+    std::stack<OOXMLPropertySet::Pointer_t> mCellProps;
+    std::stack<OOXMLPropertySet::Pointer_t> mRowProps;
+    std::stack<OOXMLPropertySet::Pointer_t> mTableProps;
     bool inTxbxContent;
     // these 4 save when inTxbxContent
     bool savedInParagraphGroup;
@@ -79,7 +77,7 @@ public:
     void setForwardEvents(bool bForwardEvents);
     bool isForwardEvents() const;
 
-    const string getHandle() const;
+    const std::string getHandle() const;
     void setHandle();
 
     void setDocument(OOXMLDocumentImpl* pDocument);
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 5bcda5fa0ad1..dfae1d1a9e04 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -689,7 +689,7 @@ string OOXMLUniversalMeasureValue::toString() const
  */
 
 
-OOXMLShapeValue::OOXMLShapeValue(uno::Reference<XShape> rShape)
+OOXMLShapeValue::OOXMLShapeValue(uno::Reference<drawing::XShape> rShape)
 : mrShape(rShape)
 {
 }
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index 9baa8951f62d..06f1fc80aaef 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -34,8 +34,6 @@ class XShape;
 namespace writerfilter {
 namespace ooxml
 {
-using namespace ::std;
-using ::com::sun::star::drawing::XShape;
 
 class OOXMLValue : public Value
 {
@@ -47,11 +45,11 @@ public:
     virtual int getInt() const SAL_OVERRIDE;
     virtual bool getBool() const;
     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;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const;
 };
 
@@ -76,9 +74,9 @@ public:
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
     virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE;
     virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE;
-    virtual string getName() const SAL_OVERRIDE;
+    virtual std::string getName() const SAL_OVERRIDE;
     virtual Kind getKind() SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual Sprm * clone() SAL_OVERRIDE;
     virtual void resolve(Properties & rProperties) SAL_OVERRIDE;
 };
@@ -92,7 +90,7 @@ public:
     virtual ~OOXMLBinaryValue();
 
     virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -107,8 +105,8 @@ public:
 
     virtual int getInt() const SAL_OVERRIDE;
     virtual bool getBool() const SAL_OVERRIDE;
-    virtual uno::Any getAny() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -120,23 +118,23 @@ public:
     explicit OOXMLStringValue(const OUString & rStr);
     virtual ~OOXMLStringValue();
 
-    virtual uno::Any getAny() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
     virtual OUString getString() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
 class OOXMLInputStreamValue : public OOXMLValue
 {
 protected:
-    uno::Reference<io::XInputStream> mxInputStream;
+    css::uno::Reference<io::XInputStream> mxInputStream;
 
 public:
     explicit OOXMLInputStreamValue(uno::Reference<io::XInputStream> xInputStream);
     virtual ~OOXMLInputStreamValue();
 
-    virtual uno::Any getAny() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -149,16 +147,16 @@ struct OOXMLPropertySetImplCompare
 class OOXMLPropertySetImpl : public OOXMLPropertySet
 {
 public:
-    typedef vector<OOXMLProperty::Pointer_t> OOXMLProperties_t;
+    typedef std::vector<OOXMLProperty::Pointer_t> OOXMLProperties_t;
 private:
     OOXMLProperties_t mProperties;
-    string msType;
+    std::string msType;
 public:
     OOXMLPropertySetImpl();
     virtual ~OOXMLPropertySetImpl();
 
     virtual void resolve(Properties & rHandler) SAL_OVERRIDE;
-    virtual string getType() const SAL_OVERRIDE;
+    virtual std::string getType() const SAL_OVERRIDE;
     virtual void add(OOXMLProperty::Pointer_t pProperty) SAL_OVERRIDE;
     virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE;
     virtual OOXMLPropertySet * clone() const SAL_OVERRIDE;
@@ -168,9 +166,9 @@ public:
     OOXMLProperties_t::const_iterator begin() const;
     OOXMLProperties_t::const_iterator end() const;
 
-    virtual void setType(const string & rsType) SAL_OVERRIDE;
+    virtual void setType(const std::string & rsType) SAL_OVERRIDE;
 
-    virtual string toString() SAL_OVERRIDE;
+    virtual std::string toString() SAL_OVERRIDE;
 };
 
 class OOXMLPropertySetValue : public OOXMLValue
@@ -181,7 +179,7 @@ public:
     virtual ~OOXMLPropertySetValue();
 
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -195,8 +193,8 @@ public:
     virtual ~OOXMLIntegerValue();
 
     virtual int getInt() const SAL_OVERRIDE;
-    virtual uno::Any getAny() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -210,7 +208,7 @@ public:
     virtual ~OOXMLHexValue();
 
     virtual int getInt() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -224,33 +222,33 @@ public:
     virtual ~OOXMLUniversalMeasureValue();
 
     virtual int getInt() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue* clone() const SAL_OVERRIDE;
 };
 
 class OOXMLShapeValue : public OOXMLValue
 {
 protected:
-    uno::Reference<XShape> mrShape;
+    css::uno::Reference<css::drawing::XShape> mrShape;
 public:
-    explicit OOXMLShapeValue(uno::Reference<XShape> rShape);
+    explicit OOXMLShapeValue(uno::Reference<css::drawing::XShape> rShape);
     virtual ~OOXMLShapeValue();
 
-    virtual uno::Any getAny() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
 class OOXMLStarMathValue : public OOXMLValue
 {
 protected:
-    uno::Reference< embed::XEmbeddedObject > component;
+    css::uno::Reference< embed::XEmbeddedObject > component;
 public:
-    explicit OOXMLStarMathValue( uno::Reference< embed::XEmbeddedObject > component );
+    explicit OOXMLStarMathValue( css::uno::Reference< embed::XEmbeddedObject > component );
     virtual ~OOXMLStarMathValue();
 
-    virtual uno::Any getAny() const SAL_OVERRIDE;
-    virtual string toString() const SAL_OVERRIDE;
+    virtual css::uno::Any getAny() const SAL_OVERRIDE;
+    virtual std::string toString() const SAL_OVERRIDE;
     virtual OOXMLValue * clone() const SAL_OVERRIDE;
 };
 
@@ -259,7 +257,7 @@ class OOXMLTableImpl : public OOXMLTable
 public:
     typedef boost::shared_ptr<OOXMLValue> ValuePointer_t;
 private:
-    typedef vector<ValuePointer_t> PropertySets_t;
+    typedef std::vector<ValuePointer_t> PropertySets_t;
     PropertySets_t mPropertySets;
 
 public:
@@ -268,7 +266,7 @@ public:
 
     virtual void resolve(Table & rTable) SAL_OVERRIDE;
     virtual void add(ValuePointer_t pPropertySet);
-    virtual string getType() const SAL_OVERRIDE;
+    virtual std::string getType() const SAL_OVERRIDE;
     virtual OOXMLTable * clone() const SAL_OVERRIDE;
 };
 
diff --git a/writerfilter/source/ooxml/RefAndPointer.hxx b/writerfilter/source/ooxml/RefAndPointer.hxx
index 9f87b409be49..49eb280f0de8 100644
--- a/writerfilter/source/ooxml/RefAndPointer.hxx
+++ b/writerfilter/source/ooxml/RefAndPointer.hxx
@@ -26,8 +26,6 @@
 namespace writerfilter {
 namespace ooxml
 {
-using namespace ::com::sun::star;
-using namespace ::std;
 
 template <class Interface, class ChildClass>
 class RefAndPointer
@@ -45,8 +43,8 @@ public:
     : mpHandler(pHandler), mRef(pHandler)
     {
 #ifdef DEBUG_MEMORY
-        clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
-             << endl;
+        std::clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
+             << std::endl;
 #endif
     }
 
@@ -56,8 +54,8 @@ public:
         mpHandler = dynamic_cast<ChildClass *>(xRef.get());
 #ifdef DEBUG_MEMORY
         if (mpHandler != NULL)
-            clog << "MEMORY:" << mpHandler->getInstanceNumber()
-                 << ":RefAndPointer" << endl;
+            std::clog << "MEMORY:" << mpHandler->getInstanceNumber()
+                 << ":RefAndPointer" << std::endl;
 #endif
     }
 
@@ -65,8 +63,8 @@ public:
     {
 #ifdef DEBUG_MEMORY
         if (mpHandler != NULL)
-            clog << "MEMORY:" << mpHandler->getInstanceNumber()
-                 << ":~RefAndPointer" << endl;
+            std::clog << "MEMORY:" << mpHandler->getInstanceNumber()
+                 << ":~RefAndPointer" << std::endl;
 #endif
     }