[Libreoffice-commits] .: starmath/source sw/source

Julien Nabet serval2412 at kemper.freedesktop.org
Wed Mar 2 13:39:27 PST 2011


 starmath/source/cfgitem.cxx                |    3 ++-
 sw/source/core/crsr/crossrefbookmark.cxx   |    3 +--
 sw/source/core/unocore/SwXTextDefaults.cxx |    3 +--
 sw/source/ui/config/usrpref.cxx            |    3 ++-
 sw/source/ui/envelp/envimg.cxx             |    3 ++-
 sw/source/ui/envelp/labelcfg.cxx           |    3 ++-
 sw/source/ui/envelp/labfmt.cxx             |    3 ++-
 sw/source/ui/envelp/labimg.cxx             |    3 ++-
 sw/source/ui/envelp/mailmrge.cxx           |    3 ++-
 sw/source/ui/misc/numberingtypelistbox.cxx |    3 ++-
 sw/source/ui/uno/unodispatch.cxx           |    3 ++-
 sw/source/ui/uno/unofreg.cxx               |    3 ++-
 sw/source/ui/uno/unotxvw.cxx               |    3 ++-
 13 files changed, 24 insertions(+), 15 deletions(-)

New commits:
commit a25bb85dbff615a92f40a29125550e3e68247b90
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 2 22:32:49 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 99dcf51..383f41b 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -38,11 +38,12 @@
 #include "smdll.hxx"
 #include "format.hxx"
 
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
+using ::rtl::OUString;
+
 
 static const char* aRootName = "Office.Math";
 
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 97e093b..f737d64 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -32,8 +32,7 @@
 #include <crossrefbookmark.hxx>
 #include <ndtxt.hxx>
 
-using namespace rtl;
-
+using ::rtl::OUString;
 namespace sw { namespace mark
 {
     CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 7ca5be0..c74f072 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -49,12 +49,11 @@
 #include <hintids.hxx>
 
 
-using rtl::OUString;
-using namespace rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
+using rtl::OUString;
 
 
 SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc ) :
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 979c45e..921a845 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -48,10 +48,11 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using ::rtl::OUString;
+
 
 void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
 {
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index cb76592..d4e0bdf 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -54,9 +54,10 @@
 #endif
 
 using namespace utl;
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 
+using ::rtl::OUString;
+
 
 TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
 
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index e2afb7c..f3afb6a 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -38,10 +38,11 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
+using ::rtl::OUString;
+
 SwLabelConfig::SwLabelConfig() :
     ConfigItem(C2U("Office.Labels/Manufacturer"))
 {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 23b0bc6..acabdaf 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -49,10 +49,11 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
+using ::rtl::OUString;
+
 #define ROUND(x) ((USHORT) ((x) + .5))
 
 SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 1f6b9a7..e74023a 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -43,9 +43,10 @@
 #include <unomid.h>
 
 using namespace utl;
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 
+using ::rtl::OUString;
+
 SwLabItem::SwLabItem() :
 
     SfxPoolItem(FN_LABEL),
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 517b0a3..289a1b5 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -76,7 +76,6 @@
 
 #include <algorithm>
 
-using namespace rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -91,6 +90,8 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::ui::dialogs;
 
+using ::rtl::OUString;
+
 struct SwMailMergeDlg_Impl
 {
     uno::Reference<runtime::XFormController> xFController;
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 223be31..04594b0 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -39,7 +39,8 @@
 #include <unomid.h>
 
 using namespace com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 struct SwNumberingTypeListBox_Impl
 {
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 417efa3..3b00645 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -43,7 +43,8 @@
 
 
 using namespace ::com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 const char* cURLStart 			= ".uno:DataSourceBrowser/";
 const char* cURLFormLetter 		= ".uno:DataSourceBrowser/FormLetter";
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index 320aab5..6ceba9f 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -39,10 +39,11 @@
 #define INCLUDED_STRING_H
 #endif
 
-using namespace rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 
+using ::rtl::OUString;
+
 // module
 extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SwUnoModule_getImplementationName() throw();
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index e6dfaf8..8c4265e 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -93,11 +93,12 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::frame;
-using namespace rtl;
 
 using ::com::sun::star::util::URL;
 using comphelper::HelperBaseNoState;
 
+using ::rtl::OUString;
+
 SV_IMPL_PTRARR( SelectionChangeListenerArr, XSelectionChangeListenerPtr );
 
 SwPaM* lcl_createPamCopy(const SwPaM& rPam)


More information about the Libreoffice-commits mailing list