[Libreoffice-commits] core.git: 7 commits - writerfilter/inc writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sun May 18 08:12:10 PDT 2014
writerfilter/inc/dmapper/DomainMapper.hxx | 6
writerfilter/inc/ooxml/OOXMLDocument.hxx | 61 +++----
writerfilter/inc/resourcemodel/LoggedResources.hxx | 24 +-
writerfilter/inc/resourcemodel/QNameToString.hxx | 9 -
writerfilter/inc/resourcemodel/TableManager.hxx | 6
writerfilter/inc/resourcemodel/TagLogger.hxx | 4
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 18 --
writerfilter/inc/resourcemodel/XPathLogger.hxx | 15 -
writerfilter/source/dmapper/BorderHandler.hxx | 4
writerfilter/source/dmapper/CellColorHandler.cxx | 128 +++++++--------
writerfilter/source/dmapper/CellColorHandler.hxx | 6
writerfilter/source/dmapper/CellMarginHandler.hxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2
writerfilter/source/dmapper/FontTable.cxx | 4
writerfilter/source/dmapper/FontTable.hxx | 2
writerfilter/source/dmapper/FormControlHelper.hxx | 12 -
writerfilter/source/dmapper/GraphicHelpers.hxx | 4
writerfilter/source/dmapper/GraphicImport.hxx | 2
writerfilter/source/dmapper/LatentStyleHandler.hxx | 2
writerfilter/source/dmapper/MeasureHandler.hxx | 4
writerfilter/source/dmapper/NumberingManager.hxx | 2
writerfilter/source/dmapper/PageBordersHandler.hxx | 2
writerfilter/source/dmapper/PropertyMap.hxx | 6
writerfilter/source/dmapper/PropertyMapHelper.hxx | 8
writerfilter/source/dmapper/SettingsTable.cxx | 2
writerfilter/source/dmapper/SettingsTable.hxx | 8
writerfilter/source/dmapper/TDefTableHandler.hxx | 4
writerfilter/source/dmapper/TextEffectsHandler.cxx | 35 +---
writerfilter/source/dmapper/ThemeTable.cxx | 2
writerfilter/source/dmapper/ThemeTable.hxx | 2
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 17 +
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 15 -
writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx | 2
writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx | 4
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 6
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 76 ++++----
writerfilter/source/ooxml/OOXMLFactory.hxx | 2
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 17 -
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 41 ++--
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 27 +--
writerfilter/source/ooxml/OOXMLParserState.cxx | 4
writerfilter/source/ooxml/OOXMLParserState.hxx | 10 -
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 10 -
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 2
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 68 +++----
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 40 ++--
writerfilter/source/ooxml/RefAndPointer.hxx | 24 +-
writerfilter/source/resourcemodel/LoggedResources.cxx | 26 +--
writerfilter/source/resourcemodel/XPathLogger.cxx | 6
writerfilter/source/resourcemodel/qnametostrcore.cxx | 4
writerfilter/source/rtftok/rtfdocumentfactory.cxx | 10 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 34 +--
writerfilter/source/rtftok/rtfsdrimport.cxx | 2
writerfilter/source/rtftok/rtfsdrimport.hxx | 18 +-
writerfilter/source/rtftok/rtfvalue.cxx | 2
writerfilter/source/rtftok/rtfvalue.hxx | 18 +-
57 files changed, 422 insertions(+), 453 deletions(-)
New commits:
commit 85500add33b7cdb647b61c83aa6b84a94f3b98a1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 17:02:46 2014 +0200
writerfilter: drop last 'using' statement from headers
Change-Id: I08a13793c40bec0b9a657e01f4c973cc0e393d4d
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index ee2b1aa..da25adf 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 130ec48..1c6a977 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 ec36603..c05a676 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 69a4c3f..89478a0 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 8dfcb17..edc53ff 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 390e661..30d7592 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 996f8f8..847dcd5 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 06f1fc8..1e0b640 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 494011f..c000e78 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 3f97253..ea1686d 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 49eb280..4f45eda 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
commit 3278565556067782a3499f6bc75a25a4796d8b29
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 16:25:53 2014 +0200
writerfilter: drop remaining non-css global 'using' from headers
Change-Id: I70e5e276a084d951d73879aa2aa4f19e9d2d32f8
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index e9d81cf..f8f2638 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 429b508..2f10ff7 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 235e089..aa08c79 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 72f8f39..d7f6005 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 5bcda5f..dfae1d1 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 9baa895..06f1fc8 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 9f87b40..49eb280 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
}
commit ff3d44d727d6d34a88e5b53f4b784aa0ac698653
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 16:22:52 2014 +0200
writerfilter: drop remaining 'using' statements from headers in dmapper
Change-Id: I4c84388b4fae7fe27bcc6266e9978fe9d230435d
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index e96acd6..0b25ca2 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -88,7 +88,7 @@ WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint)
return pResult;
}
-WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fraction & rFractionY)
+WrapPolygon::Pointer_t WrapPolygon::scale(const resourcemodel::Fraction & rFractionX, const resourcemodel::Fraction & rFractionY)
{
WrapPolygon::Pointer_t pResult(new WrapPolygon);
@@ -97,7 +97,7 @@ WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fra
while (aIt != aItEnd)
{
- awt::Point aPoint(Fraction(aIt->X) * rFractionX, Fraction(aIt->Y) * rFractionY);
+ awt::Point aPoint(resourcemodel::Fraction(aIt->X) * rFractionX, resourcemodel::Fraction(aIt->Y) * rFractionY);
pResult->addPoint(aPoint);
++aIt;
}
@@ -111,17 +111,17 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr
const sal_uInt32 nWrap100Percent = 21600;
- Fraction aMove(nWrap100Percent, rSrcSize.Width);
- aMove = aMove * Fraction(15, 1);
+ resourcemodel::Fraction aMove(nWrap100Percent, rSrcSize.Width);
+ aMove = aMove * resourcemodel::Fraction(15, 1);
awt::Point aMovePoint(aMove, 0);
pResult = move(aMovePoint);
- Fraction aScaleX(nWrap100Percent, Fraction(nWrap100Percent) + aMove);
- Fraction aScaleY(nWrap100Percent, Fraction(nWrap100Percent) - aMove);
+ resourcemodel::Fraction aScaleX(nWrap100Percent, resourcemodel::Fraction(nWrap100Percent) + aMove);
+ resourcemodel::Fraction aScaleY(nWrap100Percent, resourcemodel::Fraction(nWrap100Percent) - aMove);
pResult = pResult->scale(aScaleX, aScaleY);
- Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent);
- Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent);
+ resourcemodel::Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent);
+ resourcemodel::Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent);
pResult = pResult->scale(aScaleSrcX, aScaleSrcY);
return pResult;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index cd987ab..371e310 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -28,8 +28,6 @@
namespace writerfilter {
namespace dmapper {
-using resourcemodel::Fraction;
-
class WrapPolygon
{
public:
@@ -53,7 +51,7 @@ public:
size_t size() const;
WrapPolygon::Pointer_t move(const css::awt::Point & rMove);
- WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
+ WrapPolygon::Pointer_t scale(const resourcemodel::Fraction & rFractionX, const resourcemodel::Fraction & rFractionY);
WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize);
css::drawing::PointSequenceSequence getPointSequenceSequence() const;
};
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index a543a9f..dc62679 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -32,8 +32,6 @@
namespace writerfilter {
namespace ooxml {
-using namespace std;
-
enum ResourceType_t {
RT_NoResource,
RT_Table,
commit d8adfa8e8564da38ed6914dace33bab73caece94
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 16:14:23 2014 +0200
writerfilter: drop global 'using css' from WrapPolygonHandler.hxx
Change-Id: Ibecc12f74e55360ee03baf7d170ab5589d3ed3ab
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 0bfd7b4..59584fa 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -37,8 +37,6 @@ namespace dmapper
{
class DomainMapper;
-using namespace std;
-
struct SettingsTable_Impl;
class SettingsTable : public LoggedProperties, public LoggedTable
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index df992d1..e96acd6 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -29,6 +29,7 @@
namespace writerfilter {
using resourcemodel::resolveSprmProps;
+using namespace com::sun::star;
namespace dmapper {
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 0452cc8..cd987ab 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -28,13 +28,12 @@
namespace writerfilter {
namespace dmapper {
-using namespace ::com::sun::star;
using resourcemodel::Fraction;
class WrapPolygon
{
public:
- typedef ::std::deque<awt::Point> Points_t;
+ typedef ::std::deque<css::awt::Point> Points_t;
typedef ::boost::shared_ptr<WrapPolygon> Pointer_t;
private:
@@ -44,7 +43,7 @@ public:
WrapPolygon();
virtual ~WrapPolygon();
- void addPoint(const awt::Point & rPoint);
+ void addPoint(const css::awt::Point & rPoint);
Points_t::const_iterator begin() const;
Points_t::const_iterator end() const;
@@ -53,10 +52,10 @@ public:
size_t size() const;
- WrapPolygon::Pointer_t move(const awt::Point & rMove);
+ WrapPolygon::Pointer_t move(const css::awt::Point & rMove);
WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
- WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size & rSrcSize);
- drawing::PointSequenceSequence getPointSequenceSequence() const;
+ WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize);
+ css::drawing::PointSequenceSequence getPointSequenceSequence() const;
};
class WrapPolygonHandler : public LoggedProperties
commit ab06a1b74c0edc0d0d792c046afe4afbaaa1ada8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 16:10:47 2014 +0200
writerfilter: drop global 'using' from XPathLogger
Change-Id: I8686a0aa3786284ab946d3c58b458ad211eb347d
diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx
index bdfd94c..57e8aeb 100644
--- a/writerfilter/inc/resourcemodel/XPathLogger.hxx
+++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx
@@ -29,19 +29,16 @@
namespace writerfilter
{
-using ::std::stack;
-using ::std::string;
-using ::std::vector;
class XPathLogger
{
- typedef boost::unordered_map<string, unsigned int> TokenMap_t;
+ typedef boost::unordered_map<std::string, unsigned int> TokenMap_t;
typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;
TokenMapPointer_t mp_tokenMap;
- stack<TokenMapPointer_t> m_tokenMapStack;
- vector<string> m_path;
- string m_currentPath;
+ std::stack<TokenMapPointer_t> m_tokenMapStack;
+ std::vector<std::string> m_path;
+ std::string m_currentPath;
void updateCurrentPath();
@@ -49,8 +46,8 @@ public:
explicit XPathLogger();
virtual ~XPathLogger();
- string getXPath() const;
- void startElement(string _token);
+ std::string getXPath() const;
+ void startElement(std::string _token);
void endElement();
};
}
diff --git a/writerfilter/source/resourcemodel/XPathLogger.cxx b/writerfilter/source/resourcemodel/XPathLogger.cxx
index a62d1f9..93297cb 100644
--- a/writerfilter/source/resourcemodel/XPathLogger.cxx
+++ b/writerfilter/source/resourcemodel/XPathLogger.cxx
@@ -33,7 +33,7 @@ XPathLogger::~XPathLogger()
{
}
-string XPathLogger::getXPath() const
+std::string XPathLogger::getXPath() const
{
return m_currentPath;
}
@@ -42,7 +42,7 @@ void XPathLogger::updateCurrentPath()
{
m_currentPath = "";
- for (vector<string>::const_iterator aIt = m_path.begin();
+ for (std::vector<std::string>::const_iterator aIt = m_path.begin();
aIt != m_path.end();
++aIt)
{
@@ -53,7 +53,7 @@ void XPathLogger::updateCurrentPath()
}
}
-void XPathLogger::startElement(string _token)
+void XPathLogger::startElement(std::string _token)
{
TokenMap_t::const_iterator aIt = mp_tokenMap->find(_token);
commit 1f6017f758b4caa6138ccc1e74b6d2e5b924469d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 18 16:05:18 2014 +0200
writerfilter: drop global 'using css' from WW8ResourceModel.hxx
Change-Id: I2196a1df09a6f35e4de3ab3cc84bc1e149cd8f61
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index cb65fe2..9266f08 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 d75b845..ee2b1aa 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 c33c03c..89c2a34 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 5fe3c69..c5d18df 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 62e8f78..24b8ac1 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 75bacb8..0d36342 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 4a210ac..b016039 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 c069b4b..91e758f 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 b69ed3b..d909d85 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 3e74384..6a59b84 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 ec2d7c7..ace3c71 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 eabf64f..bd11825 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 d71f59f..6a41abf 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 540724b..21612c0 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 1e7e82d..b7c4128 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 5df5cb6..8a52e70 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 84a751a..71a6e66 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 f4c6858..a3a6325 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 571181f..6977fff 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 43190dc..ed81f07 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 9c44fd2..24544a4 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 982a29b..0bfd7b4 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 583e20d..abc9ac0 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 7c1aa24..fa19d0d 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 406a2bc..2cc3566 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 e55216b..58b55b7 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 3945a48..c98cf6f 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 daf0761..69a4c3f 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 43967e8..390e661 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 67099a8..76ac56a 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 0808fb8..bdff38a 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list