writerfilter: drop last 'using' statement from headers

Change-Id: I08a13793c40bec0b9a657e01f4c973cc0e393d4d

11 files changed, 122 insertions, 136 deletions

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index ee2b1aa808cb..da25adfee727 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -71,8 +71,6 @@ namespace writerfilter {
 namespace ooxml
 {
 
-using namespace com::sun::star;
-
 class OOXMLStream
 {
 public:
@@ -85,21 +83,21 @@ public:
     /**
        Returns parser for this stream.
      */
-    virtual uno::Reference<xml::sax::XParser> getParser() = 0;
+    virtual css::uno::Reference<css::xml::sax::XParser> getParser() = 0;
 
     /**
        Returns fast parser for this stream.
      */
-    virtual uno::Reference<xml::sax::XFastParser> getFastParser() = 0;
+    virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() = 0;
 
-    virtual uno::Reference<io::XInputStream> getDocumentStream() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() = 0;
 
-    virtual uno::Reference<io::XInputStream> getStorageStream() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getStorageStream() = 0;
 
     /**
        Returns component context for this stream.
      */
-    virtual uno::Reference<uno::XComponentContext> getContext() = 0;
+    virtual css::uno::Reference<css::uno::XComponentContext> getContext() = 0;
 
     /**
        Returns target URL from relationships for a given id.
@@ -112,8 +110,8 @@ public:
 
     virtual const OUString & getTarget() const = 0;
 
-    virtual uno::Reference<xml::sax::XFastTokenHandler>
-    getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext) = 0;
+    virtual css::uno::Reference<css::xml::sax::XFastTokenHandler>
+    getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) = 0;
 
 };
 
@@ -226,30 +224,29 @@ public:
      */
     virtual OUString getTargetForId(const OUString & rId) = 0;
 
-    virtual void setModel(uno::Reference<frame::XModel> xModel) = 0;
-    virtual uno::Reference<frame::XModel> getModel() = 0;
-    virtual void setDrawPage(uno::Reference<drawing::XDrawPage> xDrawPage) = 0;
-    virtual uno::Reference<drawing::XDrawPage> getDrawPage() = 0;
-    virtual uno::Reference<io::XInputStream> getInputStream() = 0;
-    virtual uno::Reference<io::XInputStream> getStorageStream() = 0;
-    virtual uno::Reference<io::XInputStream> getInputStreamForId
-    (const OUString & rId) = 0;
+    virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
+    virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
+    virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) = 0;
+    virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getInputStream() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getStorageStream() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
     virtual void setXNoteId(const sal_Int32 nId) = 0;
     virtual sal_Int32 getXNoteId() const = 0;
     virtual void setXNoteType(const Id & nId) = 0;
     virtual const Id & getXNoteType() const = 0;
     virtual const OUString & getTarget() const = 0;
-    virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0;
-    virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ) = 0;
-    virtual uno::Reference<xml::dom::XDocument> getThemeDom( ) = 0;
-    virtual void setThemeDom( uno::Reference<xml::dom::XDocument> xThemeDom ) = 0;
-    virtual uno::Reference<xml::dom::XDocument> getGlossaryDocDom( ) = 0;
-    virtual uno::Sequence<uno::Sequence< uno::Any> > getGlossaryDomList() = 0;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomList( ) = 0;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomPropsList( ) = 0;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getActiveXDomList( ) = 0;
-    virtual uno::Sequence<uno::Reference<io::XInputStream> > getActiveXBinList() = 0;
-    virtual uno::Sequence<beans::PropertyValue > getEmbeddingsList() = 0;
+    virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0;
+    virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) = 0;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getThemeDom( ) = 0;
+    virtual void setThemeDom( css::uno::Reference<css::xml::dom::XDocument> xThemeDom ) = 0;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getGlossaryDocDom( ) = 0;
+    virtual css::uno::Sequence<css::uno::Sequence< css::uno::Any> > getGlossaryDomList() = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomList( ) = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomPropsList( ) = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getActiveXDomList( ) = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::io::XInputStream> > getActiveXBinList() = 0;
+    virtual css::uno::Sequence<css::beans::PropertyValue > getEmbeddingsList() = 0;
 };
 
 
@@ -257,8 +254,8 @@ class OOXMLDocumentFactory
 {
 public:
     static OOXMLStream::Pointer_t
-    createStream(uno::Reference<uno::XComponentContext> rContext,
-                 uno::Reference<io::XInputStream> rStream,
+    createStream(css::uno::Reference<css::uno::XComponentContext> rContext,
+                 css::uno::Reference<css::io::XInputStream> rStream,
                  bool bRepairStorage,
                  OOXMLStream::StreamType_t nStreamType = OOXMLStream::DOCUMENT);
 
@@ -270,7 +267,7 @@ public:
     createStream(OOXMLStream::Pointer_t pStream, const OUString & rId);
 
     static OOXMLDocument *
-    createDocument(OOXMLStream::Pointer_t pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator);
+    createDocument(OOXMLStream::Pointer_t pStream, const css::uno::Reference<css::task::XStatusIndicator>& xStatusIndicator);
 
 };
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 130ec482c25c..1c6a9774a46c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -70,8 +70,6 @@ namespace com{ namespace sun{ namespace star{
 namespace writerfilter {
 namespace dmapper {
 
-using namespace com::sun::star;
-
 class SdtHelper;
 
 struct _PageMar
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index ec366031ee22..c05a67615d1b 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -28,19 +28,17 @@
 namespace writerfilter {
 namespace dmapper {
 
-using namespace ::com::sun::star;
-
 class FormControlHelper
 {
 public:
     typedef boost::shared_ptr<FormControlHelper> Pointer_t;
     FormControlHelper(FieldId eFieldId,
-                      uno::Reference<text::XTextDocument> rTextDocument,
+                      css::uno::Reference<css::text::XTextDocument> rTextDocument,
                       FFDataHandler::Pointer_t pFFData);
     ~FormControlHelper();
 
-    bool insertControl(uno::Reference<text::XTextRange> xTextRange);
-    bool processField(uno::Reference<text::XFormField> xFormField);
+    bool insertControl(css::uno::Reference<css::text::XTextRange> xTextRange);
+    bool processField(css::uno::Reference<css::text::XFormField> xFormField);
     bool hasFFDataHandler() const { return (m_pFFData != 0); }
 private:
     FFDataHandler::Pointer_t m_pFFData;
@@ -48,9 +46,9 @@ private:
     typedef boost::shared_ptr<FormControlHelper_Impl> ImplPointer_t;
     ImplPointer_t m_pImpl;
 
-    bool createCheckbox(uno::Reference<text::XTextRange> xTextRange,
+    bool createCheckbox(css::uno::Reference<css::text::XTextRange> xTextRange,
                         const OUString & rControlName);
-    bool createDropdown(uno::Reference<text::XTextRange> xTextRange,
+    bool createDropdown(css::uno::Reference<css::text::XTextRange> xTextRange,
                         const OUString & rControlName);
 };
 
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
index 69a4c3ff4bb4..89478a029b86 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
@@ -29,7 +29,7 @@ class OOXMLBinaryObjectReference :
         public writerfilter::Reference<BinaryObj>
 {
     OOXMLStream::Pointer_t mpStream;
-    uno::Sequence<sal_Int8> mSequence;
+    css::uno::Sequence<sal_Int8> mSequence;
     bool mbRead;
 
     void read();
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 8dfcb179b75e..edc53ffcaf0b 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -43,7 +43,7 @@
 // this extern variable is declared in OOXMLStreamImpl.hxx
 OUString customTarget;
 OUString embeddingsTarget;
-using ::com::sun::star::xml::sax::SAXException;
+using namespace ::com::sun::star;
 namespace writerfilter {
 namespace ooxml
 {
@@ -52,8 +52,6 @@ namespace ooxml
 TagLogger::Pointer_t debug_logger(TagLogger::getInstance("DEBUG"));
 #endif
 
-using namespace ::std;
-
 OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator)
     : mpStream(pStream)
     , mxStatusIndicator(xStatusIndicator)
@@ -873,7 +871,7 @@ uno::Reference<io::XInputStream> OOXMLDocumentImpl::getInputStreamForId(const OU
     return pStream->getDocumentStream();
 }
 
-string OOXMLDocumentImpl::getType() const
+std::string OOXMLDocumentImpl::getType() const
 {
     return "OOXMLDocumentImpl";
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 390e661cacc7..30d75929eb00 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -32,30 +32,28 @@ namespace writerfilter {
 namespace ooxml
 {
 
-using namespace ::com::sun::star;
-
 class OOXMLDocumentImpl : public OOXMLDocument
 {
     OOXMLStream::Pointer_t mpStream;
-    uno::Reference<task::XStatusIndicator> mxStatusIndicator;
+    css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator;
     sal_Int32 mnXNoteId;
     Id mXNoteType;
 
-    uno::Reference<frame::XModel> mxModel;
-    uno::Reference<drawing::XDrawPage> mxDrawPage;
-    uno::Reference<xml::dom::XDocument> mxGlossaryDocDom;
-    uno::Sequence < uno::Sequence< uno::Any > > mxGlossaryDomList;
-    uno::Reference<xml::sax::XFastShapeContextHandler> mxShapeContext;
-    uno::Reference<xml::dom::XDocument> mxThemeDom;
-    uno::Sequence<uno::Reference<xml::dom::XDocument> > mxCustomXmlDomList;
-    uno::Sequence<uno::Reference<xml::dom::XDocument> > mxCustomXmlDomPropsList;
-    uno::Reference<xml::dom::XDocument> mxCustomXmlProsDom;
-    uno::Sequence<uno::Reference<xml::dom::XDocument> > mxActiveXDomList;
-    uno::Sequence<uno::Reference<io::XInputStream> > mxActiveXBinList;
-    uno::Reference<io::XInputStream> mxActiveXBin;
-    uno::Reference<io::XInputStream> mxEmbeddings;
-    uno::Sequence < beans::PropertyValue > mxEmbeddingsList;
-    std::vector<beans::PropertyValue> mxEmbeddingsListTemp;
+    css::uno::Reference<css::frame::XModel> mxModel;
+    css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
+    css::uno::Reference<css::xml::dom::XDocument> mxGlossaryDocDom;
+    css::uno::Sequence < css::uno::Sequence< css::uno::Any > > mxGlossaryDomList;
+    css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mxShapeContext;
+    css::uno::Reference<css::xml::dom::XDocument> mxThemeDom;
+    css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > mxCustomXmlDomList;
+    css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > mxCustomXmlDomPropsList;
+    css::uno::Reference<css::xml::dom::XDocument> mxCustomXmlProsDom;
+    css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > mxActiveXDomList;
+    css::uno::Sequence<css::uno::Reference<css::io::XInputStream> > mxActiveXBinList;
+    css::uno::Reference<css::io::XInputStream> mxActiveXBin;
+    css::uno::Reference<css::io::XInputStream> mxEmbeddings;
+    css::uno::Sequence < css::beans::PropertyValue > mxEmbeddingsList;
+    std::vector<css::beans::PropertyValue> mxEmbeddingsListTemp;
     bool mbIsSubstream;
     /// How many paragraphs equal to 1 percent?
     sal_Int32 mnPercentSize;
@@ -74,7 +72,7 @@ protected:
                                       writerfilter::Reference<Stream>::Pointer_t pStream,
                       sal_uInt32 nId);
 
-    uno::Reference<xml::dom::XDocument> importSubStream(OOXMLStream::StreamType_t nType);
+    css::uno::Reference<css::xml::dom::XDocument> importSubStream(OOXMLStream::StreamType_t nType);
 
     void importSubStreamRelations(OOXMLStream::Pointer_t pStream, OOXMLStream::StreamType_t nType);
 
@@ -92,7 +90,7 @@ protected:
     void resolveGlossaryStream(Stream & rStream);
     void resolveEmbeddingsStream(OOXMLStream::Pointer_t pStream);
 public:
-    OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator);
+    OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const css::uno::Reference<css::task::XStatusIndicator>& xStatusIndicator);
     virtual ~OOXMLDocumentImpl();
 
     virtual void resolve(Stream & rStream) SAL_OVERRIDE;
@@ -120,29 +118,29 @@ public:
 
     virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE;
 
-    virtual void setModel(uno::Reference<frame::XModel> xModel) SAL_OVERRIDE;
-    virtual uno::Reference<frame::XModel> getModel() SAL_OVERRIDE;
-    virtual void setDrawPage(uno::Reference<drawing::XDrawPage> xDrawPage) SAL_OVERRIDE;
-    virtual uno::Reference<drawing::XDrawPage> getDrawPage() SAL_OVERRIDE;
-    virtual uno::Reference<io::XInputStream> getInputStream() SAL_OVERRIDE;
-    virtual uno::Reference<io::XInputStream> getStorageStream() SAL_OVERRIDE;
-    virtual uno::Reference<io::XInputStream> getInputStreamForId(const OUString & rId) SAL_OVERRIDE;
+    virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::frame::XModel> getModel() SAL_OVERRIDE;
+    virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::io::XInputStream> getInputStream() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::io::XInputStream> getStorageStream() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) SAL_OVERRIDE;
     virtual void setXNoteId(const sal_Int32 nId) SAL_OVERRIDE;
     virtual sal_Int32 getXNoteId() const SAL_OVERRIDE;
     virtual void setXNoteType(const Id & rId) SAL_OVERRIDE;
     virtual const Id & getXNoteType() const SAL_OVERRIDE;
     virtual const OUString & getTarget() const SAL_OVERRIDE;
-    virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ) SAL_OVERRIDE;
-    virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ) SAL_OVERRIDE;
-    virtual void setThemeDom(uno::Reference<xml::dom::XDocument> xThemeDom) SAL_OVERRIDE;
-    virtual uno::Reference<xml::dom::XDocument> getThemeDom() SAL_OVERRIDE;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomList() SAL_OVERRIDE;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomPropsList() SAL_OVERRIDE;
-    virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getActiveXDomList() SAL_OVERRIDE;
-    virtual uno::Sequence<uno::Reference<io::XInputStream> > getActiveXBinList() SAL_OVERRIDE;
-    virtual uno::Reference<xml::dom::XDocument> getGlossaryDocDom() SAL_OVERRIDE;
-    virtual uno::Sequence<uno::Sequence< uno::Any> >  getGlossaryDomList() SAL_OVERRIDE;
-    virtual uno::Sequence<beans::PropertyValue >  getEmbeddingsList() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) SAL_OVERRIDE;
+    virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) SAL_OVERRIDE;
+    virtual void setThemeDom(css::uno::Reference<css::xml::dom::XDocument> xThemeDom) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getThemeDom() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomList() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomPropsList() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getActiveXDomList() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::uno::Reference<css::io::XInputStream> > getActiveXBinList() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getGlossaryDocDom() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::uno::Sequence< css::uno::Any> >  getGlossaryDomList() SAL_OVERRIDE;
+    virtual css::uno::Sequence<css::beans::PropertyValue >  getEmbeddingsList() SAL_OVERRIDE;
 
     void incrementProgress();
 };
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 996f8f853e13..847dcd577b47 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -31,17 +31,16 @@
 namespace writerfilter {
 namespace ooxml
 {
-using namespace ::com::sun::star;
 
 class OOXMLFastContextHandler;
 
 class OOXMLFastDocumentHandler:
     public ::cppu::WeakImplHelper1<
-        xml::sax::XFastDocumentHandler>
+        css::xml::sax::XFastDocumentHandler>
 {
 public:
     OOXMLFastDocumentHandler(
-        uno::Reference< uno::XComponentContext > const & context,
+        css::uno::Reference< css::uno::XComponentContext > const & context,
         Stream* pStream,
         OOXMLDocumentImpl* pDocument,
         sal_Int32 nXNoteId );
@@ -49,42 +48,42 @@ public:
 
     // ::com::sun::star::xml::sax::XFastDocumentHandler:
     virtual void SAL_CALL startDocument()
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL endDocument()
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL setDocumentLocator
-    (const uno::Reference< xml::sax::XLocator > & xLocator)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+    (const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement
     (::sal_Int32 Element,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL startUnknownElement
     (const OUString & Namespace,
      const OUString & Name,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL endFastElement(::sal_Int32 Element)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL endUnknownElement
     (const OUString & Namespace,
      const OUString & Name)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createFastChildContext
     (::sal_Int32 Element,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createUnknownChildContext
     (const OUString & Namespace,
      const OUString & Name,
-     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL characters(const OUString & aChars)
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
     void setIsSubstream( bool bSubstream );
 
@@ -92,7 +91,7 @@ private:
     OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &); // not defined
     void operator =(OOXMLFastDocumentHandler &); // not defined
 
-    uno::Reference< uno::XComponentContext > m_xContext;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     Stream * mpStream;
 #ifdef DEBUG_ELEMENT
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index 06f1fc80aaef..1e0b6400ad2a 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -127,10 +127,10 @@ public:
 class OOXMLInputStreamValue : public OOXMLValue
 {
 protected:
-    css::uno::Reference<io::XInputStream> mxInputStream;
+    css::uno::Reference<css::io::XInputStream> mxInputStream;
 
 public:
-    explicit OOXMLInputStreamValue(uno::Reference<io::XInputStream> xInputStream);
+    explicit OOXMLInputStreamValue(css::uno::Reference<css::io::XInputStream> xInputStream);
     virtual ~OOXMLInputStreamValue();
 
     virtual css::uno::Any getAny() const SAL_OVERRIDE;
@@ -231,7 +231,7 @@ class OOXMLShapeValue : public OOXMLValue
 protected:
     css::uno::Reference<css::drawing::XShape> mrShape;
 public:
-    explicit OOXMLShapeValue(uno::Reference<css::drawing::XShape> rShape);
+    explicit OOXMLShapeValue(css::uno::Reference<css::drawing::XShape> rShape);
     virtual ~OOXMLShapeValue();
 
     virtual css::uno::Any getAny() const SAL_OVERRIDE;
@@ -242,9 +242,9 @@ public:
 class OOXMLStarMathValue : public OOXMLValue
 {
 protected:
-    css::uno::Reference< embed::XEmbeddedObject > component;
+    css::uno::Reference< css::embed::XEmbeddedObject > component;
 public:
-    explicit OOXMLStarMathValue( css::uno::Reference< embed::XEmbeddedObject > component );
+    explicit OOXMLStarMathValue( css::uno::Reference< css::embed::XEmbeddedObject > component );
     virtual ~OOXMLStarMathValue();
 
     virtual css::uno::Any getAny() const SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 494011f3736f..c000e785f288 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -32,7 +32,7 @@ namespace writerfilter {
 namespace ooxml
 {
 
-using namespace ::std;
+using namespace com::sun::star;
 
 OOXMLStreamImpl::OOXMLStreamImpl
 (uno::Reference<uno::XComponentContext> xContext,
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 3f972538a9e3..ea1686db3f11 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -33,19 +33,17 @@ namespace writerfilter {
 namespace ooxml
 {
 
-using namespace com::sun::star;
-
 class OOXMLStreamImpl : public OOXMLStream
 {
     void init();
 
-    uno::Reference<uno::XComponentContext> mxContext;
-    uno::Reference<io::XInputStream> mxStorageStream;
-    uno::Reference<embed::XStorage> mxStorage;
-    uno::Reference<embed::XRelationshipAccess> mxRelationshipAccess;
-    uno::Reference<io::XStream> mxDocumentStream;
-    uno::Reference<xml::sax::XFastParser> mxFastParser;
-    uno::Reference<xml::sax::XFastTokenHandler> mxFastTokenHandler;
+    css::uno::Reference<css::uno::XComponentContext> mxContext;
+    css::uno::Reference<css::io::XInputStream> mxStorageStream;
+    css::uno::Reference<css::embed::XStorage> mxStorage;
+    css::uno::Reference<css::embed::XRelationshipAccess> mxRelationshipAccess;
+    css::uno::Reference<css::io::XStream> mxDocumentStream;
+    css::uno::Reference<css::xml::sax::XFastParser> mxFastParser;
+    css::uno::Reference<css::xml::sax::XFastTokenHandler> mxFastTokenHandler;
 
     StreamType_t mnStreamType;
 
@@ -56,7 +54,7 @@ class OOXMLStreamImpl : public OOXMLStream
     /// Cache holding an Id <-> Target map of external relations.
     std::map<OUString, OUString> maIdCache;
 
-    bool lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
+    bool lcl_getTarget(css::uno::Reference<css::embed::XRelationshipAccess>
                        xRelationshipAccess,
                        StreamType_t nStreamType,
                        const OUString & rId,
@@ -67,26 +65,26 @@ public:
     OOXMLStreamImpl
     (OOXMLStreamImpl & rStream, StreamType_t nType);
     OOXMLStreamImpl
-    (uno::Reference<uno::XComponentContext> xContext,
-     uno::Reference<io::XInputStream> xStorageStream,
+    (css::uno::Reference<css::uno::XComponentContext> xContext,
+     css::uno::Reference<css::io::XInputStream> xStorageStream,
      StreamType_t nType, bool bRepairStorage);
     OOXMLStreamImpl(OOXMLStreamImpl & rStream, const OUString & rId);
 
     virtual ~OOXMLStreamImpl();
 
-    virtual uno::Reference<xml::sax::XParser> getParser() SAL_OVERRIDE;
-    virtual uno::Reference<xml::sax::XFastParser> getFastParser() SAL_OVERRIDE;
-    virtual uno::Reference<io::XInputStream> getDocumentStream() SAL_OVERRIDE;
-    virtual uno::Reference<io::XInputStream> getStorageStream() SAL_OVERRIDE;
-    virtual uno::Reference<uno::XComponentContext> getContext() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::sax::XParser> getParser() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::io::XInputStream> getStorageStream() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::uno::XComponentContext> getContext() SAL_OVERRIDE;
     virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE;
     virtual const OUString & getTarget() const SAL_OVERRIDE;
 
-    virtual uno::Reference<xml::sax::XFastTokenHandler>
-    getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::sax::XFastTokenHandler>
+    getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) SAL_OVERRIDE;
 
-    void setInputStream(uno::Reference<io::XInputStream> rxInputStream);
-    uno::Reference<io::XStream> accessDocumentStream();
+    void setInputStream(css::uno::Reference<css::io::XInputStream> rxInputStream);
+    css::uno::Reference<css::io::XStream> accessDocumentStream();
 };
 }}
 #endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLSTREAMIMPL_HXX
diff --git a/writerfilter/source/ooxml/RefAndPointer.hxx b/writerfilter/source/ooxml/RefAndPointer.hxx
index 49eb280f0de8..4f45eda6704c 100644
--- a/writerfilter/source/ooxml/RefAndPointer.hxx
+++ b/writerfilter/source/ooxml/RefAndPointer.hxx
@@ -31,7 +31,7 @@ template <class Interface, class ChildClass>
 class RefAndPointer
 {
     mutable ChildClass * mpHandler;
-    mutable uno::Reference<Interface> mRef;
+    mutable css::uno::Reference<Interface> mRef;
 
 public:
     RefAndPointer()
@@ -48,7 +48,7 @@ public:
 #endif
     }
 
-    RefAndPointer(uno::Reference<Interface> xRef)
+    RefAndPointer(css::uno::Reference<Interface> xRef)
     : mRef(xRef)
     {
         mpHandler = dynamic_cast<ChildClass *>(xRef.get());
@@ -74,14 +74,14 @@ public:
         mRef = pHandler;
     }
 
-    void set(uno::Reference<Interface> xHandler)
+    void set(css::uno::Reference<Interface> xHandler)
     {
         mpHandler = dynamic_cast<ChildClass*>(xHandler.get());
         mRef = xHandler;
     }
 
     ChildClass * getPointer() const { return mpHandler; }
-    const uno::Reference<Interface> getRef() const { return mRef; }
+    const css::uno::Reference<Interface> getRef() const { return mRef; }
 
     RefAndPointer & operator=
     (const RefAndPointer & rSrc)
@@ -94,7 +94,7 @@ public:
     bool is() { return getRef().is(); }
 
     operator ChildClass* () { return getPointer(); }
-    operator uno::Reference<Interface> () { return getRef(); }
+    operator css::uno::Reference<Interface> () { return getRef(); }
 };
 }}
 #endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX