diff options
Diffstat (limited to 'extensions/workben')
-rw-r--r-- | extensions/workben/pythonautotest.cxx | 4 | ||||
-rw-r--r-- | extensions/workben/pythontest.cxx | 5 | ||||
-rw-r--r-- | extensions/workben/testcomponent.cxx | 5 | ||||
-rw-r--r-- | extensions/workben/testresource.cxx | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index aab403885835..e0d3469476b9 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -42,9 +42,11 @@ #include <tools/string.hxx> #include <osl/conditn.hxx> -using namespace rtl; using namespace usr; +using ::rtl::StringToOUString; +using ::rtl::OUStringToString; + #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr() diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index dfb3fa3e0019..7f480af53c05 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -43,9 +43,12 @@ #include <tools/string.hxx> #include <osl/conditn.hxx> -using namespace rtl; using namespace usr; +using ::rtl::OUStringToString; +using ::rtl::StringToOUString; + + #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 9ba161f9eea8..ece2570df35c 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -50,9 +50,12 @@ #include <smart/com/sun/star/test/XSimpleTest.hxx> -using namespace rtl; using namespace usr; +using ::rtl::OString; +using ::rtl::OWStringToOString; +using ::rtl::OStringToOWString; + // Needed to switch on solaris threads #ifdef SOLARIS diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index 069f33c631b7..eca30044bbdc 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -37,8 +37,8 @@ #include <usr/services.hxx> #include <vcl/svapp.hxx> -using namespace rtl; using namespace usr; +using ::rtl::StringToOUString; class MyApp : public Application { |