summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/basflt/fltini.cxx2
-rw-r--r--sw/source/filter/html/htmlbas.cxx4
-rw-r--r--sw/source/filter/html/htmlform.cxx6
-rw-r--r--sw/source/filter/html/swhtml.hxx6
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/escher.hxx6
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.hxx36
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx2
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx18
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx28
-rw-r--r--sw/source/filter/xml/swxml.cxx10
-rw-r--r--sw/source/filter/xml/wrtxml.cxx10
-rw-r--r--sw/source/filter/xml/wrtxml.hxx27
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx2
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx14
-rw-r--r--sw/source/filter/xml/xmlexp.cxx22
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx10
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx6
-rw-r--r--sw/source/filter/xml/xmlimp.cxx16
-rw-r--r--sw/source/filter/xml/xmlimp.hxx21
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx6
-rw-r--r--sw/source/filter/xml/xmltble.cxx10
-rw-r--r--sw/source/filter/xml/xmltbli.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.hxx21
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.cxx12
-rw-r--r--sw/source/filter/xml/xmltexte.hxx18
-rw-r--r--sw/source/filter/xml/xmltexti.cxx10
-rw-r--r--sw/source/filter/xml/xmltexti.hxx34
34 files changed, 163 insertions, 228 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 9db885407650..545a34f211cc 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -58,7 +58,7 @@
#include <rtl/bootstrap.hxx>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
using namespace com::sun::star;
SwRead ReadAscii = 0, ReadHTML = 0, ReadXML = 0;
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 2305a92aac0b..303d8e1e22d3 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -46,8 +46,8 @@
#include "swhtml.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::container;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
static HTMLOutEvent aBodyEventTable[] =
{
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 984dcc94604b..f9c5ded4e078 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -77,9 +77,9 @@
#include "htmlform.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::form;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::form;
const sal_uInt16 TABINDEX_MIN = 0;
const sal_uInt16 TABINDEX_MAX = 32767;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 613b94e75537..8957feac177c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -772,7 +772,8 @@ private:
SfxItemSet& rCSS1ItemSet,
SvxCSS1PropertyInfo& rCSS1PropInfo,
bool bHidden=false );
- css::uno::Reference< css::drawing::XShape > InsertControl( const css::uno::Reference< css::form::XFormComponent > & rFormComp,
+ css::uno::Reference< css::drawing::XShape > InsertControl(
+ const css::uno::Reference< css::form::XFormComponent > & rFormComp,
const css::uno::Reference< css::beans::XPropertySet > & rFCompPropSet,
const Size& rSize,
sal_Int16 eVertOri,
@@ -899,8 +900,7 @@ public:
// for reading asynchronously from SvStream
virtual void Continue( int nToken ) override;
- virtual bool ParseMetaOptions( const css::uno::Reference<
- css::document::XDocumentProperties>&,
+ virtual bool ParseMetaOptions( const css::uno::Reference<css::document::XDocumentProperties>&,
SvKeyValueIterator* ) override;
};
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 990f2d47e10c..e06f81cd0cc7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -138,7 +138,7 @@ using namespace nsSwDocInfoSubType;
using namespace nsFieldFlags;
using namespace sw::util;
using namespace ::com::sun::star;
-using namespace css::drawing;
+using namespace ::com::sun::star::drawing;
static const sal_Int32 Tag_StartParagraph_1 = 1;
static const sal_Int32 Tag_StartParagraph_2 = 2;
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 4e5fa49eb662..b956d5f48c1a 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -157,8 +157,7 @@ private:
EscherPropertyContainer& rPropOpt) override;
virtual sal_uInt32 QueryTextID(
- const css::uno::Reference<
- css::drawing::XShape > &,sal_uInt32) override;
+ const css::uno::Reference< css::drawing::XShape > &, sal_uInt32) override;
virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
EscherPropertyContainer &rPropOpt) override;
public:
@@ -169,8 +168,7 @@ public:
virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override;
- EscherExHostAppData* StartShape(const css::uno::Reference<
- css::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
+ EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
private:
SwEscherEx(const SwEscherEx&) = delete;
SwEscherEx &operator=(const SwEscherEx&) = delete;
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index d468e39f4556..f9d3fc94146f 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -533,7 +533,7 @@ namespace sw
}
}
- using namespace css::i18n;
+ using namespace ::com::sun::star::i18n;
sal_uInt16 nScript = i18n::ScriptType::LATIN;
if (!rText.isEmpty() && g_pBreakIt && g_pBreakIt->GetBreakIter().is())
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index a9da2b338571..5717a91bba7b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -108,10 +108,10 @@ using namespace com::sun::star;
using namespace sw::util;
using namespace sw::types;
using namespace nsFieldFlags;
-using css::uno::Reference;
-using css::uno::UNO_QUERY;
-using css::beans::XPropertySet;
-using css::drawing::XShape;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::drawing::XShape;
bool SwBasicEscherEx::IsRelUrl()
{
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d059403f9cef..d948f8c51d77 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -100,7 +100,7 @@
#include <cstdio>
using namespace ::com::sun::star;
-using namespace css::i18n;
+using namespace ::com::sun::star::i18n;
using namespace sw::util;
using namespace sw::types;
using namespace sw::mark;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 8406e64d6a75..42ee0676f241 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -687,10 +687,8 @@ public:
std::vector<OUString> maListEntries;
virtual ~WW8FormulaControl() {}
void FormulaRead(SwWw8ControlType nWhich,SvStream *pD);
- virtual bool Import(const css::uno::Reference <
- css::lang::XMultiServiceFactory> &rServiceFactory,
- css::uno::Reference <
- css::form::XFormComponent> &rFComp,
+ virtual bool Import(const css::uno::Reference< css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference< css::form::XFormComponent> &rFComp,
css::awt::Size &rSz) = 0;
OUString msName;
};
@@ -704,10 +702,8 @@ private:
public:
explicit WW8FormulaCheckBox(SwWW8ImplReader &rR);
- virtual bool Import(const css::uno::Reference <
- css::lang::XMultiServiceFactory> &rServiceFactory,
- css::uno::Reference <
- css::form::XFormComponent> &rFComp,
+ virtual bool Import(const css::uno::Reference< css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference< css::form::XFormComponent> &rFComp,
css::awt::Size &rSz) override;
};
@@ -720,10 +716,8 @@ private:
public:
explicit WW8FormulaListBox(SwWW8ImplReader &rR);
- virtual bool Import(const css::uno::Reference <
- css::lang::XMultiServiceFactory> &rServiceFactory,
- css::uno::Reference <
- css::form::XFormComponent> &rFComp,
+ virtual bool Import(const css::uno::Reference< css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference< css::form::XFormComponent> &rFComp,
css::awt::Size &rSz) override;
};
@@ -735,10 +729,8 @@ private:
public:
explicit WW8FormulaEditBox(SwWW8ImplReader &rR);
//no real implementation, return false
- virtual bool Import(const css::uno::Reference <
- css::lang::XMultiServiceFactory> & /* rServiceFactory */,
- css::uno::Reference <
- css::form::XFormComponent> & /* rFComp */,
+ virtual bool Import(const css::uno::Reference< css::lang::XMultiServiceFactory> & /* rServiceFactory */,
+ css::uno::Reference< css::form::XFormComponent> & /* rFComp */,
css::awt::Size & /* rSz */) override { return false; }
};
@@ -747,15 +739,12 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls
public:
SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
bool InsertFormula( WW8FormulaControl &rFormula);
- virtual bool InsertControl(const css::uno::Reference<
- css::form::XFormComponent >& rFComp,
+ virtual bool InsertControl(const css::uno::Reference< css::form::XFormComponent >& rFComp,
const css::awt::Size& rSize,
- css::uno::Reference <
- css::drawing::XShape > *pShape, bool bFloatingCtrl) override;
+ css::uno::Reference< css::drawing::XShape > *pShape, bool bFloatingCtrl) override;
bool ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj);
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
- css::uno::Reference<
- css::drawing::XShape > *pShapeRef=0,
+ css::uno::Reference< css::drawing::XShape > *pShapeRef=0,
bool bFloatingCtrl=false );
private:
sal_uInt32 GenerateObjectID() { return ++mnObjectId; }
@@ -1853,8 +1842,7 @@ public: // really private, but can only be done public
eF_ResT Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr );
eF_ResT Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr);
css::awt::Size MiserableDropDownFormHack(const OUString &rString,
- css::uno::Reference<css::beans::XPropertySet>&
- rPropSet);
+ css::uno::Reference<css::beans::XPropertySet>& rPropSet);
eF_ResT Read_F_Macro( WW8FieldDesc*, OUString& rStr);
eF_ResT Read_F_DBField( WW8FieldDesc*, OUString& rStr );
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1ed3dab3924f..1faafca00c94 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -49,7 +49,7 @@
#include <stdio.h>
#endif
-using namespace css::lang;
+using namespace ::com::sun::star::lang;
//-begin
namespace SL
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index ad6855c2b27f..099d0c6e8318 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -33,17 +33,17 @@
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-using css::frame::XModel;
-using css::text::XTextCursor;
-using css::text::XTextRange;
-using css::text::XText;
-using css::text::XWordCursor;
-using css::lang::XUnoTunnel;
-using css::beans::XPropertySet;
-using css::beans::XPropertySetInfo;
+using ::com::sun::star::frame::XModel;
+using ::com::sun::star::text::XTextCursor;
+using ::com::sun::star::text::XTextRange;
+using ::com::sun::star::text::XText;
+using ::com::sun::star::text::XWordCursor;
+using ::com::sun::star::lang::XUnoTunnel;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::beans::XPropertySetInfo;
// collision with tools/DateTime: use UNO DateTime as util::DateTime
// using util::DateTime;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 40c1e612600f..34761167191b 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -54,10 +54,8 @@ class XMLRedlineImportHelper
bool bIgnoreRedlines;
// save information for saving and reconstruction of the redline mode
- css::uno::Reference<
- css::beans::XPropertySet> xModelPropertySet;
- css::uno::Reference<
- css::beans::XPropertySet> xImportInfoPropertySet;
+ css::uno::Reference<css::beans::XPropertySet> xModelPropertySet;
+ css::uno::Reference<css::beans::XPropertySet> xImportInfoPropertySet;
bool bShowChanges;
bool bRecordChanges;
css::uno::Sequence<sal_Int8> aProtectionKey;
@@ -66,13 +64,10 @@ public:
XMLRedlineImportHelper(
bool bIgnoreRedlines, // ignore redlines mode
-
// property sets of model + import info for saving + restoring the
// redline mode
- const css::uno::Reference<
- css::beans::XPropertySet> & rModel,
- const css::uno::Reference<
- css::beans::XPropertySet> & rImportInfoSet );
+ const css::uno::Reference<css::beans::XPropertySet> & rModel,
+ const css::uno::Reference<css::beans::XPropertySet> & rImportInfoSet );
virtual ~XMLRedlineImportHelper();
// create a redline object
@@ -88,10 +83,8 @@ public:
// create a text section for the redline, and return an
// XText/XTextCursor that may be used to write into it.
- css::uno::Reference<
- css::text::XTextCursor> CreateRedlineTextSection(
- css::uno::Reference< // needed to get the document
- css::text::XTextCursor> xOldCursor,
+ css::uno::Reference<css::text::XTextCursor> CreateRedlineTextSection(
+ css::uno::Reference<css::text::XTextCursor> xOldCursor, // needed to get the document
const OUString& rId); // ID used to RedlineAdd() call
// Set start or end position for a redline in the text body.
@@ -99,8 +92,7 @@ public:
void SetCursor(
const OUString& rId, // ID used in RedlineAdd() call
bool bStart, // start or end Range
- css::uno::Reference< // the actual XTextRange
- css::text::XTextRange> & rRange,
+ css::uno::Reference<css::text::XTextRange> & rRange, // the actual XTextRange
// text range is (from an XML view) outside of a paragraph
// (i.e. before a table)
bool bIsOusideOfParagraph);
@@ -117,8 +109,7 @@ public:
const OUString& rId, // ID used in RedlineAdd() call
bool bStart,
// XTextRange _inside_ a table/section
- css::uno::Reference<
- css::text::XTextRange> & rRange);
+ css::uno::Reference<css::text::XTextRange> & rRange);
// set redline mode: show changes
void SetShowChanges( bool bShowChanges );
@@ -127,8 +118,7 @@ public:
void SetRecordChanges( bool bRecordChanges );
// set redline protection key
- void SetProtectionKey(
- const css::uno::Sequence<sal_Int8> & rKey );
+ void SetProtectionKey(const css::uno::Sequence<sal_Int8> & rKey );
private:
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index bccfbdd5fbb8..c0a265443363 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -77,11 +77,11 @@
#include <sfx2/DocumentMetadataAccess.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::container;
-using namespace css::document;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::lang;
static void lcl_EnsureValidPam( SwPaM& rPam )
{
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index bddc90b9974b..c7bdb8367088 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -54,11 +54,11 @@
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::container;
-using namespace css::document;
-using namespace css::beans;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
SwXMLWriter::SwXMLWriter( const OUString& rBaseURL )
{
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 6e6c56b51c89..78bf7b0208a3 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -60,34 +60,25 @@ private:
// write a single XML stream into the package
bool WriteThroughComponent(
// the component we export
- const css::uno::Reference<
- css::lang::XComponent> & xComponent,
+ const css::uno::Reference<css::lang::XComponent> & xComponent,
const sal_Char* pStreamName, // the stream name
// service factory for pServiceName
- const css::uno::Reference<
- css::uno::XComponentContext> & rFactory,
+ const css::uno::Reference<css::uno::XComponentContext> & rFactory,
const sal_Char* pServiceName, // service name of the component
// the argument (XInitialization)
- const css::uno::Sequence<
- css::uno::Any> & rArguments,
+ const css::uno::Sequence<css::uno::Any> & rArguments,
// output descriptor
- const css::uno::Sequence<
- css::beans::PropertyValue> & rMediaDesc );
+ const css::uno::Sequence<css::beans::PropertyValue> & rMediaDesc );
// write a single output stream
// (to be called either directly or by WriteThroughComponent(...))
static bool WriteThroughComponent(
- const css::uno::Reference<
- css::io::XOutputStream> & xOutputStream,
- const css::uno::Reference<
- css::lang::XComponent> & xComponent,
- const css::uno::Reference<
- css::uno::XComponentContext> & rFactory,
+ const css::uno::Reference<css::io::XOutputStream> & xOutputStream,
+ const css::uno::Reference<css::lang::XComponent> & xComponent,
+ const css::uno::Reference<css::uno::XComponentContext> & rFactory,
const sal_Char* pServiceName,
- const css::uno::Sequence<
- css::uno::Any> & rArguments,
- const css::uno::Sequence<
- css::beans::PropertyValue> & rMediaDesc );
+ const css::uno::Sequence<css::uno::Any> & rArguments,
+ const css::uno::Sequence<css::beans::PropertyValue> & rMediaDesc );
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 8f9abcfe18fd..4e07c24a1fe2 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -38,7 +38,7 @@
#include "xmlexpit.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
enum SvXMLTokenMapAttrs
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 6b2ab2ea0147..f65604cafcfa 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -39,8 +39,7 @@ private:
SvxBrushItem *pItem;
void ProcessAttrs(
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv );
public:
@@ -50,17 +49,15 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
- const SvxBrushItem& rItem );
+ const SvxBrushItem& rItem );
SwXMLBrushItemImportContext(
SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
sal_uInt16 nWhich );
@@ -68,8 +65,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override;
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 2d0b37057ca5..67289a7b40ae 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -69,17 +69,17 @@
#include <pausethreadstarting.hxx>
using namespace ::com::sun::star;
-using namespace css::frame;
-using namespace css::lang;
-using namespace css::xml::sax;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::container;
-using namespace css::document;
-using namespace css::drawing;
-using namespace css::beans;
-using namespace css::i18n;
-using namespace css::xforms;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::xml::sax;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::xforms;
using namespace ::xmloff::token;
SwXMLExport::SwXMLExport(
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 978d22990847..b5df169bdfef 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -39,11 +39,11 @@
#include "xmlexp.hxx"
#include <SwStyleNameMapper.hxx>
-using namespace css::beans;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::drawing;
-using namespace css::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::lang;
using namespace ::xmloff::token;
void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFamily )
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 228a0fffadf0..a59ae3a3aa15 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -27,9 +27,9 @@
#include <xmlimp.hxx>
#include <IDocumentSettingAccess.hxx>
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::text;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::text;
class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
{
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7677cf684de0..bd8d5538e209 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -76,14 +76,14 @@
#include <unordered_set>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::lang;
-using namespace css::beans;
-using namespace css::container;
-using namespace css::i18n;
-using namespace css::drawing;
-using namespace css::xforms;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::xforms;
using namespace ::xmloff::token;
using namespace ::std;
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 62d9773f181a..c5e461445c7c 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -86,8 +86,7 @@ class SwXMLImport: public SvXMLImport
void UpdateTextCollConditions( SwDoc *pDoc );
void setTextInsertMode(
- const css::uno::Reference<
- css::text::XTextRange > & rInsertPos );
+ const css::uno::Reference< css::text::XTextRange > & rInsertPos );
void setStyleInsertMode( sal_uInt16 nFamilies,
bool bOverwrite );
void setBlockMode();
@@ -99,8 +98,7 @@ protected:
// before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual XMLTextImportHelper* CreateTextImport() override;
@@ -139,17 +137,14 @@ public:
SvXMLImportContext *CreateScriptContext( const OUString& rLocalName );
SvXMLImportContext *CreateStylesContext(
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
bool bAuto );
SvXMLImportContext *CreateMasterStylesContext(
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateFontDeclsContext(
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName );
sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
bool IsInsertMode() const { return bInsert; }
@@ -162,8 +157,7 @@ public:
inline SvXMLImportItemMapper& GetTableItemMapper();
SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nSubFamily, SfxItemSet& rItemSet );
const SvXMLTokenMap& GetDocElemTokenMap();
@@ -186,8 +180,7 @@ public:
virtual void initXForms() override;
// get the document properties, but only if they actually need importing
- css::uno::Reference<
- css::document::XDocumentProperties>
+ css::uno::Reference<css::document::XDocumentProperties>
GetDocumentProperties() const;
virtual void NotifyEmbeddedFontRead() override;
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 2183c9673352..2b28b352f7df 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -42,7 +42,7 @@
#include <comphelper/processfactory.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
extern SvXMLItemMapEntry aXMLTableItemMap[];
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 0c4789a32d24..ddecdccc0c35 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -50,7 +50,7 @@
#include "xmlitem.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
extern SvXMLItemMapEntry aXMLTableItemMap[];
extern SvXMLItemMapEntry aXMLTableColItemMap[];
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index b81a84f654c2..9a201702688f 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -35,9 +35,9 @@
#include "xmlexp.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::text;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
uno::Reference<document::XDocumentProperties>
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index af816d0cf1b5..66b1388b377c 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -52,11 +52,11 @@
#include <textboxhelper.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::beans;
-using namespace css::lang;
-using namespace css::container;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
using namespace ::xmloff::token;
using table::XCell;
using ::std::vector;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 1b49a0878fe9..386326a22f88 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -65,12 +65,12 @@
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::text;
-using namespace css::frame;
-using namespace css::table;
-using namespace css::xml::sax;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
enum SwXMLTableElemTokens
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index d19cea868a50..a8662e8864a8 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -59,10 +59,8 @@ class SwXMLTableContext : public XMLTextTableContext
std::vector<ColumnWidthInfo> aColumnWidths;
std::vector<OUString> *pColumnDefaultCellStyleNames;
- css::uno::Reference <
- css::text::XTextCursor > xOldCursor;
- css::uno::Reference <
- css::text::XTextContent > xTextContent;
+ css::uno::Reference< css::text::XTextCursor > xOldCursor;
+ css::uno::Reference< css::text::XTextContent > xTextContent;
SwXMLTableRows_Impl * m_pRows;
@@ -132,21 +130,18 @@ public:
TYPEINFO_OVERRIDE();
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList );
+ const OUString& rLName,
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList,
- SwXMLTableContext *pTable );
+ const OUString& rLName,
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
+ SwXMLTableContext *pTable );
virtual ~SwXMLTableContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 07b18b817658..debc85c5fd6e 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -21,8 +21,8 @@
#include "xmlimp.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
class SwXMLBodyContentContext_Impl : public SvXMLImportContext
{
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index d760bfbd9c31..fe2a0730b91d 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -48,12 +48,12 @@
#include <SwStyleNameMapper.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::style;
-using namespace css::beans;
-using namespace css::lang;
-using namespace css::document;
-using namespace css::io;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::style;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::io;
using namespace ::xmloff::token;
enum SvEmbeddedObjectTypes
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index cc2fcdaadc5a..a1a12b4da503 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -42,26 +42,20 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
const SvGlobalName aOutplaceClassId;
static SwNoTextNode *GetNoTextNode(
- const css::uno::Reference <
- css::beans::XPropertySet >& rPropSet );
+ const css::uno::Reference < css::beans::XPropertySet >& rPropSet );
protected:
virtual void exportStyleContent(
- const css::uno::Reference<
- css::style::XStyle > & rStyle ) override;
+ const css::uno::Reference< css::style::XStyle > & rStyle ) override;
virtual void _collectTextEmbeddedAutoStyles(
- const css::uno::Reference <
- css::beans::XPropertySet > & rPropSet ) override;
+ const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
virtual void _exportTextEmbedded(
- const css::uno::Reference <
- css::beans::XPropertySet > & rPropSet,
- const css::uno::Reference <
- css::beans::XPropertySetInfo > & rPropSetInfo ) override;
+ const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
+ const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ) override;
virtual void exportTable(
- const css::uno::Reference <
- css::text::XTextContent > & rTextContent,
+ const css::uno::Reference< css::text::XTextContent > & rTextContent,
bool bAutoStyles, bool bProgress ) override;
public:
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 4f914a9fcac1..deaf437e6ca9 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -62,11 +62,11 @@
#include <svl/urihelper.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::text;
-using namespace css::frame;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
using namespace xml::sax;
struct XMLServiceMapEntry_Impl
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 685a0e2c73c1..1d19ebf33e10 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -32,37 +32,31 @@ protected:
virtual SvXMLImportContext *CreateTableChildContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
- const css::uno::Reference<
- css::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
public:
SwXMLTextImportHelper(
- const css::uno::Reference <
- css::frame::XModel>& rModel,
+ const css::uno::Reference<css::frame::XModel>& rModel,
SvXMLImport& rImport,
- const css::uno::Reference <
- css::beans::XPropertySet>& rInfoSet,
+ const css::uno::Reference<css::beans::XPropertySet>& rInfoSet,
bool bInsertM, bool bStylesOnlyM, bool bProgress,
bool bBlockM, bool bOrganizerM,
bool bPreserveRedlineMode );
virtual ~SwXMLTextImportHelper();
- virtual css::uno::Reference<
- css::beans::XPropertySet>
+ virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertOLEObject( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual css::uno::Reference<
- css::beans::XPropertySet>
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
+ virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual css::uno::Reference<
- css::beans::XPropertySet>
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
+ virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertApplet(
const OUString &rName,
const OUString &rCode,
@@ -70,15 +64,13 @@ public:
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual css::uno::Reference<
- css::beans::XPropertySet>
+ virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertPlugin(
const OUString &rMimeType,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual css::uno::Reference<
- css::beans::XPropertySet>
+ virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertFloatingFrame(
const OUString &rName,
const OUString &rHRef,
@@ -100,10 +92,8 @@ public:
const OUString& rComment, /// redline comment
const css::util::DateTime& rDateTime, /// date+time
bool bMergeLastPara) override; /// merge last paragraph
- virtual css::uno::Reference<
- css::text::XTextCursor> RedlineCreateText(
- css::uno::Reference< /// needed to get the document
- css::text::XTextCursor> & rOldCursor,
+ virtual css::uno::Reference<css::text::XTextCursor> RedlineCreateText(
+ css::uno::Reference<css::text::XTextCursor> & rOldCursor, /// needed to get the document
const OUString& rId) override; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call