sw/source/filter/basflt/fltini.cxx | 2 -
sw/source/filter/html/htmlbas.cxx | 4 +-
sw/source/filter/html/htmlform.cxx | 6 +--
sw/source/filter/html/swhtml.hxx | 6 +--
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
sw/source/filter/ww8/escher.hxx | 6 +--
sw/source/filter/ww8/writerwordglue.cxx | 2 -
sw/source/filter/ww8/wrtw8esh.cxx | 8 ++--
sw/source/filter/ww8/wrtw8nds.cxx | 2 -
sw/source/filter/ww8/ww8par.hxx | 36 ++++++-------------
sw/source/filter/ww8/ww8scan.cxx | 2 -
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 18 ++++-----
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 28 ++++----------
sw/source/filter/xml/swxml.cxx | 10 ++---
sw/source/filter/xml/wrtxml.cxx | 10 ++---
sw/source/filter/xml/wrtxml.hxx | 27 ++++----------
sw/source/filter/xml/xmlbrsh.cxx | 2 -
sw/source/filter/xml/xmlbrshi.hxx | 14 ++-----
sw/source/filter/xml/xmlexp.cxx | 22 +++++------
sw/source/filter/xml/xmlfmte.cxx | 10 ++---
sw/source/filter/xml/xmlfonte.cxx | 6 +--
sw/source/filter/xml/xmlimp.cxx | 16 ++++----
sw/source/filter/xml/xmlimp.hxx | 21 +++--------
sw/source/filter/xml/xmliteme.cxx | 2 -
sw/source/filter/xml/xmlitemi.cxx | 2 -
sw/source/filter/xml/xmlmeta.cxx | 6 +--
sw/source/filter/xml/xmltble.cxx | 10 ++---
sw/source/filter/xml/xmltbli.cxx | 12 +++---
sw/source/filter/xml/xmltbli.hxx | 21 ++++-------
sw/source/filter/xml/xmltext.cxx | 4 +-
sw/source/filter/xml/xmltexte.cxx | 12 +++---
sw/source/filter/xml/xmltexte.hxx | 18 +++------
sw/source/filter/xml/xmltexti.cxx | 10 ++---
sw/source/filter/xml/xmltexti.hxx | 34 ++++++-----------
sw/source/ui/chrdlg/chardlg.cxx | 6 +--
sw/source/ui/config/mailconfigpage.cxx | 6 +--
sw/source/ui/config/optcomp.cxx | 6 +--
sw/source/ui/dbui/addresslistdialog.cxx | 18 ++++-----
sw/source/ui/dbui/addresslistdialog.hxx | 2 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 2 -
sw/source/ui/dbui/dbinsdlg.cxx | 14 +++----
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 10 ++---
sw/source/ui/dbui/mmaddressblockpage.cxx | 8 ++--
sw/source/ui/dbui/mmdocselectpage.cxx | 4 +-
sw/source/ui/dbui/mmgreetingspage.cxx | 2 -
sw/source/ui/dbui/mmlayoutpage.cxx | 10 ++---
sw/source/ui/dbui/mmoutputpage.cxx | 2 -
sw/source/ui/dbui/mmpreparemergepage.cxx | 6 +--
sw/source/ui/dbui/selectdbtabledialog.cxx | 12 +++---
sw/source/ui/dialog/macassgn.cxx | 4 +-
sw/source/ui/dialog/swdlgfact.cxx | 6 +--
sw/source/ui/dialog/swdlgfact.hxx | 8 ++--
sw/source/ui/envelp/envlop1.cxx | 6 +--
sw/source/ui/envelp/labelexp.cxx | 6 +--
sw/source/ui/envelp/labfmt.cxx | 4 +-
sw/source/ui/envelp/mailmrge.cxx | 24 ++++++------
sw/source/ui/fldui/changedb.cxx | 8 ++--
sw/source/ui/fldui/flddinf.hxx | 2 -
sw/source/ui/index/cntex.cxx | 14 +++----
sw/source/ui/index/cnttab.cxx | 6 +--
sw/source/ui/index/swuiidxmrk.cxx | 6 +--
sw/source/ui/misc/glossary.cxx | 10 ++---
sw/source/ui/misc/srtdlg.cxx | 4 +-
sw/source/ui/uno/swdetect.cxx | 10 ++---
sw/source/ui/vba/vbaapplication.cxx | 6 +--
sw/source/ui/vba/vbaeventshelper.cxx | 4 +-
sw/source/ui/vba/vbafont.cxx | 4 +-
sw/source/ui/vba/vbaglobals.cxx | 2 -
sw/source/uibase/app/appopt.cxx | 6 +--
sw/source/uibase/app/docsh.cxx | 6 +--
sw/source/uibase/app/docsh2.cxx | 16 +++-----
sw/source/uibase/app/docshini.cxx | 6 +--
sw/source/uibase/app/swmodul1.cxx | 10 ++---
sw/source/uibase/app/swmodule.cxx | 2 -
sw/source/uibase/config/barcfg.cxx | 2 -
sw/source/uibase/config/dbconfig.cxx | 2 -
sw/source/uibase/config/fontcfg.cxx | 2 -
sw/source/uibase/config/modcfg.cxx | 2 -
sw/source/uibase/config/prtopt.cxx | 2 -
sw/source/uibase/config/usrpref.cxx | 2 -
sw/source/uibase/dbui/dbtree.cxx | 16 ++++----
sw/source/uibase/dbui/mailmergehelper.cxx | 10 ++---
sw/source/uibase/dbui/mmconfigitem.cxx | 12 +++---
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 8 ++--
sw/source/uibase/dochdl/swdtflvr.cxx | 4 +-
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 6 +--
sw/source/uibase/docvw/romenu.cxx | 4 +-
sw/source/uibase/envelp/envimg.cxx | 2 -
sw/source/uibase/envelp/labelcfg.cxx | 4 +-
sw/source/uibase/envelp/labimg.cxx | 2 -
sw/source/uibase/fldui/fldmgr.cxx | 14 +++----
sw/source/uibase/fldui/xfldui.cxx | 14 +++----
sw/source/uibase/inc/SwXFilterOptions.hxx | 6 +--
sw/source/uibase/inc/hyp.hxx | 10 ++---
sw/source/uibase/inc/mailmrge.hxx | 2 -
sw/source/uibase/inc/mmconfigitem.hxx | 1
sw/source/uibase/inc/olmenu.hxx | 9 +---
sw/source/uibase/inc/unodispatch.hxx | 2 -
sw/source/uibase/inc/unotxvw.hxx | 6 +--
sw/source/uibase/inc/workctrl.hxx | 4 +-
sw/source/uibase/lingu/hhcwrp.cxx | 8 ++--
sw/source/uibase/misc/glosdoc.cxx | 2 -
sw/source/uibase/ribbar/workctrl.cxx | 6 +--
sw/source/uibase/shells/annotsh.cxx | 8 ++--
sw/source/uibase/shells/basesh.cxx | 6 +--
sw/source/uibase/shells/drawsh.cxx | 2 -
sw/source/uibase/shells/drwtxtsh.cxx | 6 +--
sw/source/uibase/shells/frmsh.cxx | 2 -
sw/source/uibase/shells/grfshex.cxx | 4 +-
sw/source/uibase/shells/textsh.cxx | 2 -
sw/source/uibase/shells/textsh2.cxx | 16 ++++----
sw/source/uibase/smartmenu/stmenu.cxx | 2 -
sw/source/uibase/table/chartins.cxx | 2 -
sw/source/uibase/uiview/srcview.cxx | 10 ++---
sw/source/uibase/uiview/uivwimp.cxx | 8 ++--
sw/source/uibase/uiview/view.cxx | 6 +--
sw/source/uibase/uiview/view2.cxx | 18 ++++-----
sw/source/uibase/uiview/viewling.cxx | 8 ++--
sw/source/uibase/uiview/viewmdi.cxx | 4 +-
sw/source/uibase/uiview/viewsrch.cxx | 6 +--
sw/source/uibase/uno/SwXDocumentSettings.cxx | 8 ++--
sw/source/uibase/uno/SwXFilterOptions.cxx | 6 +--
sw/source/uibase/uno/dlelstnr.cxx | 10 ++---
sw/source/uibase/uno/unofreg.cxx | 2 -
sw/source/uibase/uno/unomailmerge.cxx | 10 ++---
sw/source/uibase/uno/unomod.cxx | 6 +--
sw/source/uibase/uno/unotxdoc.cxx | 14 +++----
sw/source/uibase/uno/unotxvw.cxx | 16 ++++----
sw/source/uibase/utlui/condedit.cxx | 2 -
sw/source/uibase/utlui/content.cxx | 6 +--
sw/source/uibase/utlui/glbltree.cxx | 2 -
sw/source/uibase/utlui/navicfg.cxx | 2 -
sw/source/uibase/utlui/navipi.cxx | 4 +-
sw/source/uibase/utlui/numfmtlb.cxx | 4 +-
sw/source/uibase/utlui/uiitems.cxx | 2 -
sw/source/uibase/wrtsh/select.cxx | 2 -
136 files changed, 485 insertions(+), 564 deletions(-)
New commits:
commit 4671c3e2944678fa1f3875b13839391d8df49578
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 9 08:35:35 2015 +0200
formatting improvements in sw/
after my recent "com::sun::star->css in sw" commit
Change-Id: I2545648fc6f14ea0ebcabbe012e91546cf392b16
diff --git a/sw/source/filter/basflt/fltini.cxx
b/sw/source/filter/basflt/fltini.cxx
index 9db8854..545a34f 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 2305a92..303d8e1 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 984dcc9..f9c5ded 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 613b94e..8957fea 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 990f2d4..e06f81c 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 4e5fa49..b956d5f 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 d468e39..f9d3fc9 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 a9da2b3..5717a91 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 d059403..d948f8c 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 8406e64..42ee067 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 1ed3dab..1faafca 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 ad6855c..099d0c6 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 40c1e61..3476116 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 bccfbdd..c0a2654 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 bddc90b9..c7bdb83 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 6e6c56b..78bf7b0 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 8f9abcf..4e07c24 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 6b2ab2e..f65604c 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 2d0b370..67289a7 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 978d229..b5df169 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 228a0ff..a59ae3a 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 7677cf6..bd8d553 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 62d9773..c5e4614 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 2183c96..2b28b35 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 0c4789a..ddecdcc 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 b81a84f..9a20170 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 af816d0..66b1388 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 1b49a08..386326a 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 d19cea8..a8662e8 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 07b18b8..debc85c 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 d760bfb..fe2a073 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 cc2fcda..a1a12b4 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 4f914a9..deaf437 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 685a0e2..1d19ebf 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
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9ad2a35..81be508 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -54,9 +54,9 @@
#include <svx/flagsdef.hxx>
#include <svx/dialogs.hrc>
-using namespace css::ui::dialogs;
-using namespace css::lang;
-using namespace css::uno;
+using namespace ::com::sun::star::ui::dialogs;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
using namespace ::sfx2;
SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet&
rCoreSet,
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index 6baadf3..a0edd77 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -39,9 +39,9 @@
#include <helpid.h>
using namespace ::com::sun::star;
-using namespace css::lang;
-using namespace css::mail;
-using namespace css::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::mail;
+using namespace ::com::sun::star::beans;
class SwTestAccountSettingsDialog : public SfxModalDialog
{
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 1f9be8b..4cf969f 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -35,9 +35,9 @@
#include <svtools/treelistentry.hxx>
#include <IDocumentSettingAccess.hxx>
-using namespace css::beans;
-using namespace css::document;
-using namespace css::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::uno;
using namespace ::std;
struct CompatibilityItem
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx
b/sw/source/ui/dbui/addresslistdialog.cxx
index 267fba8..cd44b56 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -62,15 +62,15 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::container;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::task;
-using namespace css::beans;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::ui::dialogs;
#define ITEMID_NAME 1
#define ITEMID_TABLE 2
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx
b/sw/source/ui/dbui/addresslistdialog.hxx
index 325fbf0..cfb8438 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -70,7 +70,7 @@ class SwAddressListDialog : public SfxModalDialog
css::uno::Reference< css::sdb::XDatabaseContext> m_xDBContext;
- SwDBData
m_aDBData;
+ SwDBData m_aDBData;
void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog);
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 0fc2e80..9f9fb7f 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -42,7 +42,7 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::ui::dialogs;
class SwAddressControl_Impl : public Control
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 1913e53..550e484 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -98,13 +98,13 @@
using namespace ::dbtools;
using namespace ::com::sun::star;
-using namespace css::beans;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::uno;
const char cDBFieldStart = '<';
const char cDBFieldEnd = '>';
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 004fef5..fd9e2eb 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -26,11 +26,11 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::frame;
-using namespace css::beans;
-using namespace css::lang;
-using namespace css::util;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::util;
SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent,
uno::Sequence< beans::PropertyValue>& rValues ) :
SfxModalDialog(pParent, "TablePreviewDialog",
"modules/swriter/ui/tablepreviewdialog.ui")
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index c328dfa..fe8c59a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -39,10 +39,10 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace css::container;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
static void lcl_Move(Control* pCtrl, long nYOffset)
{
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx
b/sw/source/ui/dbui/mmdocselectpage.cxx
index b0637f4..2617a0c 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -38,9 +38,9 @@
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
using namespace svt;
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent)
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx
b/sw/source/ui/dbui/mmgreetingspage.cxx
index 5af6bb8..87cbd05 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -31,7 +31,7 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
static void lcl_FillGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx
b/sw/source/ui/dbui/mmlayoutpage.cxx
index 0328aad..b043880 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -61,11 +61,11 @@
using namespace osl;
using namespace svt;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::frame;
-using namespace css::lang;
-using namespace css::view;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::view;
#define DEFAULT_LEFT_DISTANCE (MM50*5) // 2,5 cm
#define DEFAULT_TOP_DISTANCE (MM50*11) // 5,5 cm
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx
b/sw/source/ui/dbui/mmoutputpage.cxx
index e70fce6..11b7e53 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -75,7 +75,7 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
#define MM_DOCTYPE_OOO 1
#define MM_DOCTYPE_PDF 2
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx
b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 361f5ce..7b8d649 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -33,9 +33,9 @@
#include <unomid.h>
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::sdbc;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbc;
SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard*
_pParent)
: svt::OWizardPage(_pParent, "MMPreparePage",
"modules/swriter/ui/mmpreparepage.ui")
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx
b/sw/source/ui/dbui/selectdbtabledialog.cxx
index c4b00c3..706bf05 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -35,12 +35,12 @@
#include <helpid.h>
using namespace ::com::sun::star;
-using namespace css::sdbcx;
-using namespace css::sdbc;
-using namespace css::sdb;
-using namespace css::uno;
-using namespace css::container;
-using namespace css::beans;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::beans;
class SwAddressTable : public SvSimpleTable
{
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 3dfe225..5eadf9a 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -38,8 +38,8 @@
#include <doc.hxx>
-using css::uno::Reference;
-using css::frame::XFrame;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::frame::XFrame;
SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
{
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 615ecee..f0c9c8a 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -635,9 +635,9 @@ AbstractSwInsertAbstractDlg *
SwAbstractDialogFactory_Impl::CreateSwInsertAbstra
}
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window*
pParent,
- const
SfxItemSet& rSet,
- const css::uno::Reference<
css::frame::XFrame >&,
-
sal_uInt32 nResId
+ const
SfxItemSet& rSet,
+ const
css::uno::Reference< css::frame::XFrame >&,
+ sal_uInt32
nResId
)
{
SfxModalDialog* pDlg=NULL;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index dbd78f5..8610414 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -369,10 +369,10 @@ public:
virtual ~SwAbstractDialogFactory_Impl() {}
virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window*
pParent,
- const
SfxItemSet& rAttr,
- const css::uno::Reference<
css::frame::XFrame >& _rxFrame,
-
sal_uInt32 nResId
- )
override;
+ const SfxItemSet&
rAttr,
+ const
css::uno::Reference< css::frame::XFrame >& _rxFrame,
+ sal_uInt32 nResId
+ ) override;
virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings*
pBindings,
SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo)
override;
virtual AbstractSwInsertAbstractDlg *
CreateSwInsertAbstractDlg(vcl::Window* pParent) override;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index e9bd442..89d7f9d 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -41,9 +41,9 @@
#include <unomid.h>
-using namespace css::lang;
-using namespace css::container;
-using namespace css::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
SwEnvPreview::SwEnvPreview(vcl::Window* pParent, WinBits nStyle)
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 96a00b8..2834e50 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -31,9 +31,9 @@
#include <unoprnms.hxx>
using namespace ::com::sun::star;
-using namespace css::lang;
-using namespace css::container;
-using namespace css::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::uno;
using namespace ::comphelper;
void SwVisitingCardPage::InitFrameControl()
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index df27856..dab095f 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -37,8 +37,8 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
#define ROUND(x) static_cast<long>((x) + .5)
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index b94dc89..fe75d2f 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -63,18 +63,18 @@
#include <algorithm>
using namespace ::com::sun::star;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::beans;
-using namespace css::util;
-using namespace css::uno;
-using namespace css::frame;
-using namespace css::form;
-using namespace css::view;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::form;
+using namespace ::com::sun::star::view;
+using namespace ::com::sun::star::ui::dialogs;
struct SwMailMergeDlg_Impl {
uno::Reference<runtime::XFormController> xFController;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 3b61e87..3911cd5 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -45,10 +45,10 @@
#include <unomid.h>
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::uno;
// edit insert-field
SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index b086921..a15fcbc 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -48,7 +48,7 @@ class SwFieldDokInfPage : public SwFieldPage
sal_Int32 nOldSel;
sal_uLong nOldFormat;
- OUString m_sOldCustomFieldName;
+ OUString m_sOldCustomFieldName;
DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(SubTypeHdl, ListBox&, void);
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index a734412..16ae310b 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -53,13 +53,13 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace css::text;
-using namespace css::beans;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::ucb;
-using namespace css::uno;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::uno;
+using namespace com::sun::star::ui::dialogs;
static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index cf2f40f..b779796 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -85,9 +85,9 @@
using namespace ::com::sun::star;
-using namespace css::lang;
-using namespace css::uno;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace com::sun::star::ui::dialogs;
using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index 3484711..c2f4fa4 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -69,9 +69,9 @@ static sal_uInt16 nKey1Pos = USHRT_MAX;
static sal_uInt16 nKey2Pos = USHRT_MAX;
using namespace com::sun::star;
-using namespace css::i18n;
-using namespace css::lang;
-using namespace css::util;
+using namespace com::sun::star::i18n;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::util;
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index ce9726e..6f94e2c 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -73,11 +73,11 @@
#include "access.hrc"
using namespace ::com::sun::star;
-using namespace css::lang;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::ucb;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::ui::dialogs;
using namespace ::ucbhelper;
using namespace ::sfx2;
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 955553b..a75f465 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -66,8 +66,8 @@ static bool bCsSens= false;
static sal_Unicode cDeli = '\t';
-using namespace css::lang;
-using namespace css::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index e5393be..9f6abf4 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -27,11 +27,11 @@
#include <unotools/mediadescriptor.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::io;
-using namespace css::task;
-using namespace css::beans;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
using utl::MediaDescriptor;
SwFilterDetect::SwFilterDetect()
diff --git a/sw/source/ui/vba/vbaapplication.cxx
b/sw/source/ui/vba/vbaapplication.cxx
index a641a87..2c23b71 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -38,9 +38,9 @@ using namespace ::ooo;
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-using css::uno::Reference;
-using css::uno::UNO_QUERY_THROW;
-using css::uno::UNO_QUERY;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_QUERY_THROW;
+using ::com::sun::star::uno::UNO_QUERY;
SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >&
xContext ): SwVbaApplication_BASE( xContext )
{
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx
b/sw/source/ui/vba/vbaeventshelper.cxx
index f26e8d9..71e2f99 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -23,13 +23,13 @@
#include <vbahelper/helperdecl.hxx>
using namespace ::com::sun::star;
-using namespace css::script::vba::VBAEventId;
+using namespace ::com::sun::star::script::vba::VBAEventId;
using namespace ::ooo::vba;
SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const&
aArgs, uno::Reference< uno::XComponentContext > const& xContext ) :
VbaEventsHelperBase( aArgs, xContext )
{
- using namespace css::script::ModuleType;
+ using namespace ::com::sun::star::script::ModuleType;
registerEventHandler( DOCUMENT_NEW, DOCUMENT, "Document_New" );
registerEventHandler( AUTO_NEW, NORMAL, "AutoNew" );
registerEventHandler( DOCUMENT_OPEN, DOCUMENT, "Document_Open" );
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 8298882..0975862 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -44,8 +44,8 @@ static MapPair UnderLineTable[] = {
{ word::WdUnderline::wdUnderlineDotted,
css::awt::FontUnderline::DOTTED },
{ word::WdUnderline::wdUnderlineThick,
css::awt::FontUnderline::BOLDDASH },
{ word::WdUnderline::wdUnderlineDash, css::awt::FontUnderline::DASH },
- { word::WdUnderline::wdUnderlineDotDash, css::awt::FontUnderline::DASHDOT
},
- { word::WdUnderline::wdUnderlineDotDotDash,
css::awt::FontUnderline::DASHDOTDOT },
+ { word::WdUnderline::wdUnderlineDotDash,
css::awt::FontUnderline::DASHDOT },
+ { word::WdUnderline::wdUnderlineDotDotDash,
css::awt::FontUnderline::DASHDOTDOT },
{ word::WdUnderline::wdUnderlineWavy, css::awt::FontUnderline::WAVE },
{ word::WdUnderline::wdUnderlineDottedHeavy,
css::awt::FontUnderline::BOLDDOTTED },
{ word::WdUnderline::wdUnderlineDashHeavy,
css::awt::FontUnderline::BOLDDASH },
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 127d84e..bb2859f 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -27,7 +27,7 @@
#include <cppuhelper/bootstrap.hxx>
#include "vbaapplication.hxx"
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
using namespace ::ooo::vba;
SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs,
uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE(
uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" )
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 1a1123d..f39e02c 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -68,8 +68,8 @@
#include <unomid.h>
-using namespace css::uno;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
{
@@ -151,7 +151,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
css::lang::Locale aLocale;
LanguageType nLang;
- using namespace css::i18n::ScriptType;
+ using namespace ::com::sun::star::i18n::ScriptType;
Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale"));
aLang >>= aLocale;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 5f2ccf4..e88a8e8 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -129,9 +129,9 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::script;
-using namespace css::container;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::script;
+using namespace ::com::sun::star::container;
SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell)
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 2b5bc21..484b86b 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -127,9 +127,9 @@
#include <memory>
-using namespace css::ui::dialogs;
-using namespace css::lang;
-using namespace css::uno;
+using namespace ::com::sun::star::ui::dialogs;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::sfx2;
@@ -216,7 +216,7 @@ void SwDocShell::DoFlushDocInfo()
static void lcl_processCompatibleSfxHint( const uno::Reference<
script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint )
{
- using namespace css::script::vba::VBAEventId;
+ using namespace com::sun::star::script::vba::VBAEventId;
if ( dynamic_cast<const SfxEventHint*>(&rHint) )
{
uno::Sequence< uno::Any > aArgs;
@@ -327,7 +327,7 @@ bool SwDocShell::PrepareClose( bool bUI )
m_pDoc->GetVbaEventProcessor();
if( xVbaEvents.is() )
{
- using namespace css::script::vba::VBAEventId;
+ using namespace com::sun::star::script::vba::VBAEventId;
uno::Sequence< uno::Any > aArgs;
xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
}
@@ -808,10 +808,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
}
else
{
- TransferDataContainer* pClipCntnr =
- new TransferDataContainer;
- css::uno::Reference< css::datatransfer::XTransferable >
- xRef( pClipCntnr );
+ TransferDataContainer* pClipCntnr = new
TransferDataContainer;
+ css::uno::Reference< css::datatransfer::XTransferable
> xRef( pClipCntnr );
pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF,
static_cast<sal_Char const *>(
pStrm->GetData()), pStrm->GetEndOfData() );
diff --git a/sw/source/uibase/app/docshini.cxx
b/sw/source/uibase/app/docshini.cxx
index 6773892..c716ca3 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -93,9 +93,9 @@
#include <tgrditem.hxx>
#include <memory>
-using namespace css::i18n;
-using namespace css::lang;
-using namespace css::uno;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
// Load Document
diff --git a/sw/source/uibase/app/swmodul1.cxx
b/sw/source/uibase/app/swmodul1.cxx
index 88312cb..7427473 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -62,11 +62,11 @@
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::frame;
-using namespace css::view;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::view;
+using namespace ::com::sun::star::lang;
static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView,
SwViewShell* pSh )
{
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index 3f91a1d..d2d9993 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -140,7 +140,7 @@ using namespace com::sun::star;
TYPEINIT1( SwModule, SfxModule );
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact,
diff --git a/sw/source/uibase/config/barcfg.cxx
b/sw/source/uibase/config/barcfg.cxx
index d5e33f2..b823f0e 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
#define SEL_TYPE_TABLE_TEXT 0
#define SEL_TYPE_LIST_TEXT 1
diff --git a/sw/source/uibase/config/dbconfig.cxx
b/sw/source/uibase/config/dbconfig.cxx
index 29f0eeb..3aee9f4 100644
--- a/sw/source/uibase/config/dbconfig.cxx
+++ b/sw/source/uibase/config/dbconfig.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
const Sequence<OUString>& SwDBConfig::GetPropertyNames()
{
diff --git a/sw/source/uibase/config/fontcfg.cxx
b/sw/source/uibase/config/fontcfg.cxx
index 8e1b52a..8aa4233 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -30,7 +30,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16
eWestern, sal_Int16 eCJK, sal_Int16 eCTL)
{
diff --git a/sw/source/uibase/config/modcfg.cxx
b/sw/source/uibase/config/modcfg.cxx
index 8d51c18..d932fea 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -39,7 +39,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
#define GLOB_NAME_CALC 0
#define GLOB_NAME_IMPRESS 1
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index e59d0ae..f182ca2 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace com::sun::star::uno;
// Ctor
Sequence<OUString> SwPrintOptions::GetPropertyNames()
diff --git a/sw/source/uibase/config/usrpref.cxx
b/sw/source/uibase/config/usrpref.cxx
index 46ade91..657ee2a3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -36,7 +36,7 @@
using namespace utl;
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
{
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index fc62336..9cb14f9 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -52,14 +52,14 @@
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::task;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::beans;
struct SwConnectionData
{
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx
b/sw/source/uibase/dbui/mailmergehelper.cxx
index 25fd697..1b49433 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -43,11 +43,11 @@
#include <dbui.hrc>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::container;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
namespace SwMailMergeHelper
{
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 8efa477..027821c 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -50,12 +50,12 @@
using namespace utl;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::beans;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
const char* cAddressDataAssignments = "AddressDataAssignments";
const char* cDBColumnAssignments = "DBColumnAssignments";
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index c4cbb3c..2302023 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -52,10 +52,10 @@
#include <cmdid.h>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::text;
-using namespace css::linguistic2;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::linguistic2;
+using namespace ::com::sun::star::beans;
SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index c69c6b3..2f7d5c5 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -145,8 +145,8 @@ extern bool g_bExecuteDrag;
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::datatransfer;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::datatransfer;
using namespace nsTransferBufferType;
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index f75dafd..24bd2ca 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -139,13 +139,11 @@ class SidebarTextControlAccessibleContext : public
VCLXAccessibleComponent
virtual void SAL_CALL
addAccessibleEventListener (
- const css::uno::Reference<
- css::accessibility::XAccessibleEventListener >&
xListener)
+ const css::uno::Reference<
css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
removeAccessibleEventListener (
- const css::uno::Reference<
- css::accessibility::XAccessibleEventListener >&
xListener)
+ const css::uno::Reference<
css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException, std::exception) override;
protected:
diff --git a/sw/source/uibase/docvw/romenu.cxx
b/sw/source/uibase/docvw/romenu.cxx
index 20873b4..8cac918 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -46,8 +46,8 @@
#include <helpid.h>
#include <docvw.hrc>
-using namespace css::lang;
-using namespace css::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::sfx2;
diff --git a/sw/source/uibase/envelp/envimg.cxx
b/sw/source/uibase/envelp/envimg.cxx
index d1ed4a6..e5f12bb 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -41,7 +41,7 @@
#endif
using namespace utl;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
diff --git a/sw/source/uibase/envelp/labelcfg.cxx
b/sw/source/uibase/envelp/labelcfg.cxx
index dcd1a4a..bfa2220 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -30,8 +30,8 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
{
diff --git a/sw/source/uibase/envelp/labimg.cxx
b/sw/source/uibase/envelp/labimg.cxx
index d893eb9..a388440 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -29,7 +29,7 @@
#include <unomid.h>
using namespace utl;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
SwLabItem::SwLabItem() :
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 230ea4e..fa6ecca 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -80,13 +80,13 @@
#include <cnttab.hxx>
#include <unotools/useroptions.hxx>
-using namespace css::uno;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::beans;
-using namespace css::text;
-using namespace css::style;
-using namespace css::sdbc;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::text;
+using namespace com::sun::star::style;
+using namespace com::sun::star::sdbc;
using namespace ::com::sun::star;
using namespace nsSwDocInfoSubType;
diff --git a/sw/source/uibase/fldui/xfldui.cxx
b/sw/source/uibase/fldui/xfldui.cxx
index 95d6ec5..c7164e5 100644
--- a/sw/source/uibase/fldui/xfldui.cxx
+++ b/sw/source/uibase/fldui/xfldui.cxx
@@ -33,13 +33,13 @@
#include <view.hxx>
#include <swmodule.hxx>
-using namespace css::uno;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::beans;
// This file contains all routines of the fldui directory, which must compile
// with exceptions. So we can reduce the code of the other files, which don't
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx
b/sw/source/uibase/inc/SwXFilterOptions.hxx
index b76ecf5..0e206e8 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -41,10 +41,8 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper<
OUString sFilterName;
OUString sFilterOptions;
- css::uno::Reference<
- css::io::XInputStream > xInputStream;
- css::uno::Reference<
- css::lang::XComponent > xModel;
+ css::uno::Reference< css::io::XInputStream > xInputStream;
+ css::uno::Reference< css::lang::XComponent > xModel;
bool bExport;
public:
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 8031e22..258c396 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -29,10 +29,9 @@ class SwView;
class SwHyphWrapper : public SvxSpellWrapper {
private:
SwView* pView;
- css::uno::Reference<
- css::linguistic2::XHyphenator > xHyph;
- sal_uInt16 nPageCount; // page count for progress view
- sal_uInt16 nPageStart; // 1st checked page
+ css::uno::Reference< css::linguistic2::XHyphenator > xHyph;
+ sal_uInt16 nPageCount; // page count for progress view
+ sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text
bool bAutomatic : 1; // insert separators without further
inquiry
bool bInfoBox : 1; // display info-box when ending
@@ -46,8 +45,7 @@ protected:
public:
SwHyphWrapper( SwView* pVw,
- css::uno::Reference<
- css::linguistic2::XHyphenator > &rxHyph,
+ css::uno::Reference< css::linguistic2::XHyphenator >
&rxHyph,
bool bStart, bool bOther, bool bSelect );
virtual ~SwHyphWrapper();
};
diff --git a/sw/source/uibase/inc/mailmrge.hxx
b/sw/source/uibase/inc/mailmrge.hxx
index 9132a28..b0ab3ba 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -98,7 +98,7 @@ class SwMailMergeDlg : public SvxStandardDialog
SwModuleOptions* pModOpt;
DBManagerOptions nMergeType;
- css::uno::Sequence< css::uno::Any > m_aSelection;
+ css::uno::Sequence< css::uno::Any > m_aSelection;
css::uno::Reference< css::frame::XFrame2 > m_xFrame;
Size m_aDialogSize;
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx
b/sw/source/uibase/inc/mmconfigitem.hxx
index 4eb41f0..7637bfb 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -49,7 +49,6 @@ struct SwDocMergeInfo
class SW_DLLPUBLIC SwMailMergeConfigItem
{
-// css::uno::Sequence< OUString> m_aSavedDocuments;
SwMailMergeConfigItem_Impl* m_pImpl;
//session information - not stored in configuration
bool m_bAddressInserted;
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index 3e1324b..1aab51e 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -36,10 +36,8 @@ class SwWrtShell;
class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
{
SwWrtShell* m_pSh;
- css::uno::Sequence< css::uno::Reference<
- css::linguistic2::XDictionary > > m_aDics;
- css::uno::Reference<
- css::linguistic2::XSpellAlternatives > m_xSpellAlt;
+ css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary >
> m_aDics;
+ css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt;
css::linguistic2::ProofreadingResult m_xGrammarResult;
sal_Int32 m_nGrammarError;
@@ -71,8 +69,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
public:
SwSpellPopup( SwWrtShell *pWrtSh,
- const css::uno::Reference<
- css::linguistic2::XSpellAlternatives > &xAlt,
+ const css::uno::Reference< css::linguistic2::XSpellAlternatives >
&xAlt,
const OUString & rParaText );
SwSpellPopup( SwWrtShell *pWrtSh,
diff --git a/sw/source/uibase/inc/unodispatch.hxx
b/sw/source/uibase/inc/unodispatch.hxx
index 2889116..b115f7e 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -90,7 +90,7 @@ public:
struct StatusStruct_Impl
{
css::uno::Reference< css::frame::XStatusListener> xListener;
- css::util::URL aURL;
+ css::util::URL aURL;
};
typedef std::list< StatusStruct_Impl > StatusListenerList;
class SwXDispatch : public cppu::WeakImplHelper
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index e6d9b4b..f94a55f 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -111,15 +111,13 @@ public:
//XRubySelection
virtual css::uno::Sequence<
- css::uno::Sequence<
- css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool
bAutomatic )
+ css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL
getRubyList( sal_Bool bAutomatic )
throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setRubyList(
const css::uno::Sequence<
- css::uno::Sequence<
- css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
+ css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool
bAutomatic )
throw (css::uno::RuntimeException,
std::exception) override;
diff --git a/sw/source/uibase/inc/workctrl.hxx
b/sw/source/uibase/inc/workctrl.hxx
index b2e220e..2331682 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -121,8 +121,8 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt )
override;
public:
- SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference<
css::frame::XFrame >& rFrame, vcl::Window *pParent );
- virtual ~SwScrollNaviPopup();
+ SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference<
css::frame::XFrame >& rFrame, vcl::Window *pParent );
+ virtual ~SwScrollNaviPopup();
virtual void dispose() override;
static OUString GetQuickHelpText(bool bNext);
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx
b/sw/source/uibase/lingu/hhcwrp.cxx
index 889541a..d4c2479 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -50,10 +50,10 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace css::text;
-using namespace css::uno;
-using namespace css::linguistic2;
-using namespace css::i18n;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::linguistic2;
+using namespace ::com::sun::star::i18n;
// Description: Turn off frame/object shell if applicable
diff --git a/sw/source/uibase/misc/glosdoc.cxx
b/sw/source/uibase/misc/glosdoc.cxx
index e3a4857..6b14708 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -44,7 +44,7 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
namespace
{
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index 10a2e22..9b8276d 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -60,9 +60,9 @@
#define ZOOM_ENTRIES 9
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::frame;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index d3ebe91..5f68f0c 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -126,9 +126,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::i18n;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::i18n;
#define SwAnnotationShell
@@ -1401,7 +1401,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest
&rReq)
if (!pOLV)
return;
- using namespace css::i18n;
+ using namespace ::com::sun::star::i18n;
sal_uInt32 nMode = 0;
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 3aa8c41..f6fe41d 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -149,9 +149,9 @@ namespace
}
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::frame;
-using namespace css::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell)
diff --git a/sw/source/uibase/shells/drawsh.cxx
b/sw/source/uibase/shells/drawsh.cxx
index 2144038..86df266 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -67,7 +67,7 @@
#include "misc.hrc"
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx
b/sw/source/uibase/shells/drwtxtsh.cxx
index 98b77ec..ff2c67e 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -77,9 +77,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::i18n;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::i18n;
SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell)
diff --git a/sw/source/uibase/shells/frmsh.cxx
b/sw/source/uibase/shells/frmsh.cxx
index 1e065af..0872981 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -85,7 +85,7 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
// Prototypes
static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine,
SvxBorderLine& rBorderLine);
diff --git a/sw/source/uibase/shells/grfshex.cxx
b/sw/source/uibase/shells/grfshex.cxx
index 4910b7a..69a18da 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -57,8 +57,8 @@
// <- #111827#
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index 807db43..8c65f71 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -876,7 +876,7 @@ void SwTextShell::ExecDelete(SfxRequest &rReq)
void SwTextShell::ExecTransliteration( SfxRequest & rReq )
{
- using namespace css::i18n;
+ using namespace ::com::sun::star::i18n;
sal_uInt32 nMode = 0;
switch( rReq.GetSlot() )
diff --git a/sw/source/uibase/shells/textsh2.cxx
b/sw/source/uibase/shells/textsh2.cxx
index 19a5789..fddb215 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -66,14 +66,14 @@
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::container;
-using namespace css::lang;
-using namespace css::sdb;
-using namespace css::sdbc;
-using namespace css::sdbcx;
-using namespace css::beans;
-using namespace css::frame;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
struct DBTextStruct_Impl
{
diff --git a/sw/source/uibase/smartmenu/stmenu.cxx
b/sw/source/uibase/smartmenu/stmenu.cxx
index 9d45454..42751cf 100644
--- a/sw/source/uibase/smartmenu/stmenu.cxx
+++ b/sw/source/uibase/smartmenu/stmenu.cxx
@@ -29,7 +29,7 @@
#include <breakit.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
Sequence< OUString >& rSmartTagTypes,
diff --git a/sw/source/uibase/table/chartins.cxx
b/sw/source/uibase/table/chartins.cxx
index 7f54cf5..c28c186 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -59,7 +59,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
using namespace ::com::sun::star;
-using namespace css::uno;
+using namespace ::com::sun::star::uno;
Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size&
rDialogSize, const Rectangle& rLogicChart )
{
diff --git a/sw/source/uibase/uiview/srcview.cxx
b/sw/source/uibase/uiview/srcview.cxx
index 80a6c84..eb66d8a 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -91,12 +91,12 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
using namespace ::com::sun::star;
-using namespace css::i18n;
-using namespace css::lang;
-using namespace css::uno;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
-using css::util::SearchOptions;
+using ::com::sun::star::util::SearchOptions;
#define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT |
SfxViewShellFlags::NO_NEWWINDOW )
diff --git a/sw/source/uibase/uiview/uivwimp.cxx
b/sw/source/uibase/uiview/uivwimp.cxx
index b1f792b..17fbac4 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -49,10 +49,10 @@
#include <view.hrc>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::scanner;
-using namespace css::lang;
-using namespace css::datatransfer::clipboard;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::scanner;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::datatransfer::clipboard;
SwView_Impl::SwView_Impl(SwView* pShell)
: mxXTextView()
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 4cb1d17..7dd9064 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -114,9 +114,9 @@
#include <svl/cjkoptions.hxx>
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::scanner;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::scanner;
extern bool g_bNoInterrupt; // in swmodule.cxx
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index b506d55..7c528dc 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -153,15 +153,15 @@ const char sStatusComma[] = " , ";
using namespace sfx2;
using namespace ::com::sun::star;
-using namespace css::i18n;
-using namespace css::util;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::scanner;
-using namespace css::beans;
-using namespace css::container;
-using namespace css::sdb;
-using namespace css::ui::dialogs;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::scanner;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::ui::dialogs;
static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16
nWhichId )
{
diff --git a/sw/source/uibase/uiview/viewling.cxx
b/sw/source/uibase/uiview/viewling.cxx
index 7e83a86..e2d37d2 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -90,10 +90,10 @@
using namespace sw::mark;
using namespace ::com::sun::star;
-using namespace css::beans;
-using namespace css::uno;
-using namespace css::linguistic2;
-using namespace css::smarttags;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::linguistic2;
+using namespace ::com::sun::star::smarttags;
// Lingu-Dispatcher
diff --git a/sw/source/uibase/uiview/viewmdi.cxx
b/sw/source/uibase/uiview/viewmdi.cxx
index 58fc726..a722622 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -56,8 +56,8 @@
sal_uInt16 SwView::m_nMoveType = NID_PGE;
sal_Int32 SwView::m_nActMark = 0;
-using namespace css::uno;
-using namespace css::frame;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly )
{
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index f37acae..92d9076 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -69,9 +69,9 @@
#include "PostItMgr.hxx"
using namespace com::sun::star;
-using namespace css::i18n;
-using namespace css::lang;
-using namespace css::util;
+using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::util;
//Search Parameter
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx
b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 3aefd4f..a48e970 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -50,10 +50,10 @@
using namespace comphelper;
using namespace ::com::sun::star;
-using namespace css::uno;
-using namespace css::beans;
-using namespace css::lang;
-using namespace css::i18n;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::i18n;
enum SwDocumentSettingsPropertyHandles
{
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx
b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 003cc4b..d2bec25 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -35,9 +35,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace css::ui::dialogs;
-using namespace css::document;
-using namespace css::lang;
+using namespace ::com::sun::star::ui::dialogs;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::lang;
#define FILTER_OPTIONS_NAME "FilterOptions"
diff --git a/sw/source/uibase/uno/dlelstnr.cxx
b/sw/source/uibase/uno/dlelstnr.cxx
index 98c5f8b..b3c7ba2 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -37,11 +37,11 @@
#include <view.hxx>
using namespace ::com::sun::star;
-using namespace css::lang;
-using namespace css::frame;
-using namespace css::uno;
-using namespace css::linguistic2;
-using namespace css::linguistic2::LinguServiceEventFlags;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::linguistic2;
+using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags;
SwLinguServiceEventListener::SwLinguServiceEventListener()
{
diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx
index a3671cf..a5f6468 100644
--- a/sw/source/uibase/uno/unofreg.cxx
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
