[Libreoffice-commits] .: framework/source

Julien Nabet serval2412 at kemper.freedesktop.org
Sat Feb 26 06:44:41 PST 2011


 framework/source/helper/actiontriggerhelper.cxx        |    3 ++-
 framework/source/helper/propertysetcontainer.cxx       |    2 +-
 framework/source/helper/uiconfigelementwrapperbase.cxx |    3 +--
 framework/source/helper/uielementwrapperbase.cxx       |    2 +-
 framework/source/services/sessionlistener.cxx          |    4 ++--
 framework/source/tabwin/tabwindow.cxx                  |    2 +-
 framework/source/tabwin/tabwinfactory.cxx              |    2 +-
 framework/source/uiconfiguration/globalsettings.cxx    |    3 ++-
 8 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit cde8628a072ff4d4331f85356fabad95d22c1e46
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 26 15:44:27 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 8bbaa2c..9812634 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -45,13 +45,14 @@
 
 const USHORT START_ITEMID = 1000;
 
-using namespace rtl;
 using namespace com::sun::star::awt;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
+using ::rtl::OUString;
+
 namespace framework
 {
 
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx
index d38aefc..e5a2994 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/helper/propertysetcontainer.cxx
@@ -35,7 +35,7 @@
 
 #define WRONG_TYPE_EXCEPTION	"Only XPropertSet allowed!"
 
-using namespace rtl;
+using ::rtl::OUString;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::container;
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 47738d0..db300d6 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -70,8 +70,7 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM(
 const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
 const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ));
 const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" ));
-
-using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 9977ece..6bd01e0 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -58,10 +58,10 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM(
 const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
 const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
 
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
+using ::rtl::OUString;
 
 namespace framework
 {
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 0d65e2e..7246d5f 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -84,8 +84,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 namespace framework{
 
 //_______________________________________________
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 409d482..494aa57 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -60,7 +60,7 @@
 //_________________________________________________________________________________________________________________
 //
 
-using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star;
 
 namespace framework
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index c6c98e6..a430f45 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -56,7 +56,7 @@
 //_________________________________________________________________________________________________________________
 //
 
-using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index b4701f4..5a704a8 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -60,9 +60,10 @@
 //_________________________________________________________________________________________________________________
 // 
 
-using namespace rtl;
 using namespace ::com::sun::star;
 
+using ::rtl::OUString;
+
 //_________________________________________________________________________________________________________________
 //	Namespace
 //_________________________________________________________________________________________________________________


More information about the Libreoffice-commits mailing list