formatting improvements in sw/

after my recent "com::sun::star->css in sw" commit

Change-Id: I2545648fc6f14ea0ebcabbe012e91546cf392b16

34 files changed, 121 insertions, 121 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9ad2a358c977..81be5088c0f0 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 6baadf341abf..a0edd7784b21 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 1f9be8bb1014..4cf969f803f3 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 267fba8f086b..cd44b5614d03 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 325fbf0f18ae..cfb8438123bf 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 0fc2e80943bf..9f9fb7fbce30 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 1913e5310a03..550e48450761 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 004fef5014cd..fd9e2eb34f5c 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 c328dfa29905..fe8c59a3543b 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 b0637f42ba3d..2617a0cf61ee 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 5af6bb8b2054..87cbd05e3038 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 0328aad6f0e3..b0438805205b 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 e70fce6b76cd..11b7e5321a79 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 361f5cea96fc..7b8d649fc7f5 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 c4b00c3658ca..706bf0549637 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 3dfe225521d6..5eadf9a3f2e8 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 615ecee68950..f0c9c8a66a75 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 dbd78f5be072..8610414e4cd9 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 e9bd44250dbe..89d7f9d749da 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 96a00b8019c7..2834e504ac85 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 df278562547f..dab095f3b155 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 b94dc89484e7..fe75d2fd1820 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 3b61e87a2a5e..3911cd579a5c 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 b086921c66c9..a15fcbcdbcb2 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 a73441282771..16ae310b60ae 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 cf2f40f2fc95..b77979663e4f 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 348471114d77..c2f4fa4aca09 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 ce9726e8a744..6f94e2c7c6a0 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 955553bc9932..a75f46504e51 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 e5393bec7bed..9f6abf4248b8 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 a641a87e1ea0..2c23b717a878 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 f26e8d945b4d..71e2f99c8a31 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 82988820e2b5..0975862fb4e5 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 127d84e6fdb7..bb2859f7d259 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" )