[Libreoffice-commits] .: Branch 'gr2' - odk/examples unodevtools/source

[Martin Hosken]

 odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx                        |    5 +++--
 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx |    4 +++-
 odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx                               |    4 +++-
 odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx                 |    3 ++-
 odk/examples/cpp/DocumentLoader/DocumentLoader.cxx                                               |    4 ++--
 odk/examples/java/Inspector/SourceCodeGenerator.java                                             |    2 +-
 unodevtools/source/unodevtools/typeblob.cxx                                                      |    6 +++++-
 7 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit c7153c3aa1af28e80de7aefc184796b015049d79
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 2 20:36:58 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
index 31436a2..024c9f5 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
@@ -41,12 +41,13 @@
 #include <my_module/MyService1.hpp>
 #include <my_module/MyService2.hpp>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
-//namespace cssuno = ::com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 SAL_IMPLEMENT_MAIN()
 {
     try
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index 8b69531..12195ae 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::document;
 using namespace com::sun::star::lang;
@@ -71,6 +70,9 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::container;
 using namespace com::sun::star::ucb;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+
 
 OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) 
     throw( RuntimeException )
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index 0f4f055..336aa4e 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -45,9 +45,11 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
-using namespace rtl;
 using namespace cppu;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 SAL_IMPLEMENT_MAIN()
 {
     // create the initial component context
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
index 3735b80..99f9da6 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
@@ -41,11 +41,12 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index e214390..37ba2f7 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -58,7 +58,6 @@
 
 #include <string.h>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -66,7 +65,8 @@ using namespace com::sun::star::bridge;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::registry;
 
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 //============================================================================
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index 932854c..e8aa20c 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -1470,7 +1470,7 @@ class UnoObjectDefinition{
         public String getFinalHeaderStatements(){
             String sReturn = "";
             sReturn += "\nnamespace " + getCSSNameSpaceString() + " = com::sun::star;\n";
-            sReturn += "using namespace rtl;\n";
+            sReturn += "using ::rtl::OUString;\n";
             return sReturn;
         }
         
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index fe91026..4baf0b3 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -52,9 +52,13 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 using namespace com::sun::star::reflection;
-using namespace rtl;
 using namespace codemaker;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
 namespace unodevtools {
 
 void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex,