summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--linguistic/source/defs.hxx2
-rw-r--r--linguistic/workben/sprophelp.cxx4
-rw-r--r--linguistic/workben/sspellimp.hxx5
-rw-r--r--scripting/source/inc/util/util.hxx4
4 files changed, 5 insertions, 10 deletions
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index a84af59df42a..a7af9e7ba6a1 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -41,8 +41,6 @@ class SvStream;
///////////////////////////////////////////////////////////////////////////
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
-
typedef boost::shared_ptr< SvStream > SvStreamPtr;
namespace css = ::com::sun::star;
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 4bf29bf1e0b0..26480de208d8 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::linguistic2;
using namespace linguistic;
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
+#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
///////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ PropertyChgHelper::PropertyChgHelper(
OUString *pName = aPropNames.getArray();
for (INT32 i = 0; i < nPropCount; ++i)
{
- pName[i] = A2OU( pPropNames[i] );
+ pName[i] = ::rtl::OUString::createFromAscii( pPropNames[i] );
}
}
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index ad3a2d0708db..ebded3b83905 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -52,9 +52,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
-
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
-
///////////////////////////////////////////////////////////////////////////
@@ -168,7 +165,7 @@ public:
inline OUString SpellChecker::getImplementationName_Static() throw()
{
- return A2OU( "com.sun.star.lingu.examples.SpellChecker" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" ));
}
diff --git a/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx
index da0fa56984f1..2b6998654192 100644
--- a/scripting/source/inc/util/util.hxx
+++ b/scripting/source/inc/util/util.hxx
@@ -33,7 +33,7 @@
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
-#define OUSTR(x) ::rtl::OUString( ::rtl::OUString::createFromAscii(x) )
+#define OUSTR(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x) )
namespace scripting_util
{
@@ -43,7 +43,7 @@ namespace scripting_util
if(!xRef.is())
{
- throw ::com::sun::star::uno::RuntimeException(OUSTR(Msg), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
+ throw ::com::sun::star::uno::RuntimeException(::rtl::OUString::createFromAscii(Msg), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
}
}
}