summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-03-02 20:36:58 +0100
committerJulien Nabet <serval2412@yahoo.fr>2011-03-02 20:36:58 +0100
commit3b2efb2043dd6871d5025b41936b6069a8dfda13 (patch)
tree62836bb4af09b81e39e50f31b352634434b15c3c
parent13b487277ae9a2f29964885bc3d2d7dd6d222813 (diff)
Remove "using namespace ::rtl"
Notes
split repo tag: sdk_LO-BASE-INTEGRATION-DEV300_M101
-rw-r--r--odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx5
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx4
-rw-r--r--odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx4
-rw-r--r--odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx3
-rw-r--r--odk/examples/cpp/DocumentLoader/DocumentLoader.cxx4
-rw-r--r--odk/examples/java/Inspector/SourceCodeGenerator.java2
-rw-r--r--unodevtools/source/unodevtools/typeblob.cxx6
7 files changed, 19 insertions, 9 deletions
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
index c377cdb1ebb7..849667b74964 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 76cc30a6a019..7adc3da26372 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 a02b184047da..49519dc2ac5f 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 32388bb3cded..e76f64a05a24 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 f18cb7b165be..b9aafda6c8d9 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 6661fe9604ad..ae8f3c4887d7 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 b92bc374cb90..3a057e7ec80d 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,