[Libreoffice-commits] .: comphelper/inc comphelper/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Oct 24 13:06:39 PDT 2010
comphelper/inc/comphelper/sequenceasvector.hxx | 2
comphelper/source/container/embeddedobjectcontainer.cxx | 16 +-
comphelper/source/container/enumerablemap.cxx | 6 -
comphelper/source/misc/componentmodule.cxx | 4
comphelper/source/misc/configurationhelper.cxx | 14 +-
comphelper/source/misc/ihwrapnofilter.cxx | 4
comphelper/source/misc/locale.cxx | 94 ++++++++--------
comphelper/source/streaming/otransactedfilestream.cxx | 4
comphelper/source/streaming/seekableinput.cxx | 2
comphelper/source/streaming/seqinputstreamserv.cxx | 4
10 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 56a335e163b24ff7bfb5b032769f2a0a54af4796
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 24 21:02:18 2010 +0100
micro opts
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 2e83083..730c5e1 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -163,7 +163,7 @@ class SequenceAsVector : public ::std::vector< TElementType >
::com::sun::star::uno::Sequence< TElementType > lSource;
if (!(aSource >>= lSource))
throw ::com::sun::star::beans::IllegalTypeException(
- ::rtl::OUString::createFromAscii("SequenceAsVector operator<<(Any) was called with an unsupported Any type."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceAsVector operator<<(Any) was called with an unsupported Any type.")),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
(*this) << lSource;
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 33668eb..8110af3 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -109,12 +109,12 @@ const uno::Reference < embed::XStorage >& EmbedImpl::GetReplacements()
try
{
mxImageStorage = mxStorage->openStorageElement(
- ::rtl::OUString::createFromAscii( "ObjectReplacements" ), embed::ElementModes::READWRITE );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectReplacements")), embed::ElementModes::READWRITE );
}
catch ( uno::Exception& )
{
mxImageStorage = mxStorage->openStorageElement(
- ::rtl::OUString::createFromAscii( "ObjectReplacements" ), embed::ElementModes::READ );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectReplacements")), embed::ElementModes::READ );
}
}
@@ -172,7 +172,7 @@ sal_Bool EmbeddedObjectContainer::CommitImageSubStorage()
{
// get the open mode from the parent storage
sal_Int32 nMode = 0;
- uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("OpenMode") );
+ uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode")) );
if ( aAny >>= nMode )
bReadOnlyMode = !(nMode & embed::ElementModes::WRITE );
} // if ( xSet.is() )
@@ -364,7 +364,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
{
// get the open mode from the parent storage
sal_Int32 nMode = 0;
- uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("OpenMode") );
+ uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode")) );
if ( aAny >>= nMode )
bReadOnlyMode = !(nMode & embed::ElementModes::WRITE );
}
@@ -1217,7 +1217,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
if ( xSet.is() )
{
- uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("MediaType") );
+ uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
aAny >>= *pMediaType;
}
}
@@ -1272,13 +1272,13 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno
if ( !xPropSet.is() )
throw uno::RuntimeException();
- xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),
+ xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption")),
uno::makeAny( (sal_Bool)sal_True ) );
uno::Any aAny;
aAny <<= rMediaType;
- xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii("MediaType"), aAny );
+ xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aAny );
- xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "Compressed" ),
+ xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
uno::makeAny( (sal_Bool)sal_True ) );
}
catch( uno::Exception& )
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index b1d08b2..b88c97a 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -532,16 +532,16 @@ namespace comphelper
Type aKeyType, aValueType;
if ( !( _arguments[0] >>= aKeyType ) )
- throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "com.sun.star.uno.Type expected." ), *this, 1 );
+ throw IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Type expected.")), *this, 1 );
if ( !( _arguments[1] >>= aValueType ) )
- throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "com.sun.star.uno.Type expected." ), *this, 2 );
+ throw IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Type expected.")), *this, 2 );
Sequence< Pair< Any, Any > > aInitialValues;
bool bMutable = true;
if ( nArgumentCount == 3 )
{
if ( !( _arguments[2] >>= aInitialValues ) )
- throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "[]com.sun.star.beans.Pair<any,any> expected." ), *this, 2 );
+ throw IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]com.sun.star.beans.Pair<any,any> expected.")), *this, 2 );
bMutable = false;
}
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index ff9568e..9caf529 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -159,7 +159,7 @@ namespace comphelper
{
::rtl::OUString sMainKeyName( sRootKey );
sMainKeyName += component->sImplementationName;
- sMainKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
try
{
@@ -176,7 +176,7 @@ namespace comphelper
::rtl::OUString sSingletonKeyName( sRootKey );
sSingletonKeyName += component->sImplementationName;
- sSingletonKeyName += ::rtl::OUString::createFromAscii( "/UNO/SINGLETONS/" );
+ sSingletonKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SINGLETONS/"));
sSingletonKeyName += component->sSingletonName;
xNewKey = _rxRootKey->createKey( sSingletonKeyName );
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 28fdee1..7ce1bba 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -53,27 +53,27 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
sal_Int32 eMode )
{
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
- xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), css::uno::UNO_QUERY_THROW);
+ xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), css::uno::UNO_QUERY_THROW);
::comphelper::SequenceAsVector< css::uno::Any > lParams;
css::beans::PropertyValue aParam ;
// set root path
- aParam.Name = ::rtl::OUString::createFromAscii("nodepath");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
aParam.Value <<= sPackage;
lParams.push_back(css::uno::makeAny(aParam));
// enable all locales mode
if ((eMode & ConfigurationHelper::E_ALL_LOCALES)==ConfigurationHelper::E_ALL_LOCALES)
{
- aParam.Name = ::rtl::OUString::createFromAscii("locale");
- aParam.Value <<= ::rtl::OUString::createFromAscii("*");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("locale"));
+ aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
lParams.push_back(css::uno::makeAny(aParam));
}
// enable lazy writing
sal_Bool bLazy = ((eMode & ConfigurationHelper::E_LAZY_WRITE)==ConfigurationHelper::E_LAZY_WRITE);
- aParam.Name = ::rtl::OUString::createFromAscii("lazywrite");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite"));
aParam.Value = css::uno::makeAny(bLazy);
lParams.push_back(css::uno::makeAny(aParam));
@@ -83,11 +83,11 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
sal_Bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY);
if (bReadOnly)
xCFG = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
lParams.getAsConstList());
else
xCFG = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
lParams.getAsConstList());
return xCFG;
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index 53d31c7..5ee98ca 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -52,13 +52,13 @@ namespace comphelper
uno::Sequence< ::rtl::OUString > SAL_CALL OIHWrapNoFilterDialog::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandlerWrapper");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandlerWrapper"));
return aRet;
}
::rtl::OUString SAL_CALL OIHWrapNoFilterDialog::impl_staticGetImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.task.InteractionHandlerWrapper");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.task.InteractionHandlerWrapper"));
}
//----------------------------------------------------------------------------------------------------
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index 0759a00..e08f5aa 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -48,8 +48,8 @@ const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.';
const Locale Locale::X_DEFAULT()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("x"),
- ::rtl::OUString::createFromAscii("default"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")));
return aLocale;
}
@@ -57,7 +57,7 @@ const Locale Locale::X_DEFAULT()
const Locale Locale::EN()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("en"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")),
::rtl::OUString());
return aLocale;
}
@@ -66,8 +66,8 @@ const Locale Locale::EN()
const Locale Locale::EN_US()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("en"),
- ::rtl::OUString::createFromAscii("US"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")));
return aLocale;
}
@@ -75,8 +75,8 @@ const Locale Locale::EN_US()
const Locale Locale::DE_DE()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("de"),
- ::rtl::OUString::createFromAscii("DE"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")));
return aLocale;
}
@@ -84,8 +84,8 @@ const Locale Locale::DE_DE()
const Locale Locale::DE_CH()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("de"),
- ::rtl::OUString::createFromAscii("CH"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CH")));
return aLocale;
}
@@ -93,8 +93,8 @@ const Locale Locale::DE_CH()
const Locale Locale::DE_AT()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("de"),
- ::rtl::OUString::createFromAscii("AT"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AT")));
return aLocale;
}
@@ -102,7 +102,7 @@ const Locale Locale::DE_AT()
const Locale Locale::AR()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("ar"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ar")),
::rtl::OUString());
return aLocale;
}
@@ -111,7 +111,7 @@ const Locale Locale::AR()
const Locale Locale::CA()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("ca"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca")),
::rtl::OUString());
return aLocale;
}
@@ -120,7 +120,7 @@ const Locale Locale::CA()
const Locale Locale::CS()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("cs"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cs")),
::rtl::OUString());
return aLocale;
}
@@ -129,7 +129,7 @@ const Locale Locale::CS()
const Locale Locale::DA()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("da"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("da")),
::rtl::OUString());
return aLocale;
}
@@ -138,7 +138,7 @@ const Locale Locale::DA()
const Locale Locale::EL()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("el"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("el")),
::rtl::OUString());
return aLocale;
}
@@ -147,7 +147,7 @@ const Locale Locale::EL()
const Locale Locale::ES()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("es"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("es")),
::rtl::OUString());
return aLocale;
}
@@ -156,7 +156,7 @@ const Locale Locale::ES()
const Locale Locale::FI()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("fi"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fi")),
::rtl::OUString());
return aLocale;
}
@@ -165,7 +165,7 @@ const Locale Locale::FI()
const Locale Locale::FR()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("fr"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fr")),
::rtl::OUString());
return aLocale;
}
@@ -174,7 +174,7 @@ const Locale Locale::FR()
const Locale Locale::HE()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("he"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")),
::rtl::OUString());
return aLocale;
}
@@ -183,8 +183,8 @@ const Locale Locale::HE()
const Locale Locale::HI_IN()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("hi"),
- ::rtl::OUString::createFromAscii("IN"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN")));
return aLocale;
}
@@ -192,7 +192,7 @@ const Locale Locale::HI_IN()
const Locale Locale::HU()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("hu"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hu")),
::rtl::OUString());
return aLocale;
}
@@ -201,7 +201,7 @@ const Locale Locale::HU()
const Locale Locale::IT()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("it"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("it")),
::rtl::OUString());
return aLocale;
}
@@ -210,7 +210,7 @@ const Locale Locale::IT()
const Locale Locale::JA()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("ja"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja")),
::rtl::OUString());
return aLocale;
}
@@ -219,7 +219,7 @@ const Locale Locale::JA()
const Locale Locale::KO()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("ko"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ko")),
::rtl::OUString());
return aLocale;
}
@@ -228,7 +228,7 @@ const Locale Locale::KO()
const Locale Locale::NL()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("nl"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nl")),
::rtl::OUString());
return aLocale;
}
@@ -237,7 +237,7 @@ const Locale Locale::NL()
const Locale Locale::PL()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("pl"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pl")),
::rtl::OUString());
return aLocale;
}
@@ -246,7 +246,7 @@ const Locale Locale::PL()
const Locale Locale::PT()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("pt"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")),
::rtl::OUString());
return aLocale;
}
@@ -255,8 +255,8 @@ const Locale Locale::PT()
const Locale Locale::PT_BR()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("pt"),
- ::rtl::OUString::createFromAscii("BR"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BR")));
return aLocale;
}
@@ -264,7 +264,7 @@ const Locale Locale::PT_BR()
const Locale Locale::RU()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("ru"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ru")),
::rtl::OUString());
return aLocale;
}
@@ -273,7 +273,7 @@ const Locale Locale::RU()
const Locale Locale::SK()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("sk"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sk")),
::rtl::OUString());
return aLocale;
}
@@ -282,7 +282,7 @@ const Locale Locale::SK()
const Locale Locale::SL()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("sl"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sl")),
::rtl::OUString());
return aLocale;
}
@@ -291,7 +291,7 @@ const Locale Locale::SL()
const Locale Locale::SV()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("sv"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sv")),
::rtl::OUString());
return aLocale;
}
@@ -300,7 +300,7 @@ const Locale Locale::SV()
const Locale Locale::TH()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("th"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")),
::rtl::OUString());
return aLocale;
}
@@ -309,7 +309,7 @@ const Locale Locale::TH()
const Locale Locale::TR()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("tr"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tr")),
::rtl::OUString());
return aLocale;
}
@@ -318,8 +318,8 @@ const Locale Locale::TR()
const Locale Locale::X_COMMENT()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("x"),
- ::rtl::OUString::createFromAscii("comment"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("comment")));
return aLocale;
}
@@ -327,8 +327,8 @@ const Locale Locale::X_COMMENT()
const Locale Locale::X_TRANSLATE()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("x"),
- ::rtl::OUString::createFromAscii("translate"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("translate")));
return aLocale;
}
@@ -336,8 +336,8 @@ const Locale Locale::X_TRANSLATE()
const Locale Locale::X_NOTRANSLATE()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("x"),
- ::rtl::OUString::createFromAscii("notranslate"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notranslate")));
return aLocale;
}
@@ -345,8 +345,8 @@ const Locale Locale::X_NOTRANSLATE()
const Locale Locale::ZH_CN()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("zh"),
- ::rtl::OUString::createFromAscii("CN"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CN")));
return aLocale;
}
@@ -354,8 +354,8 @@ const Locale Locale::ZH_CN()
const Locale Locale::ZH_TW()
{
static Locale aLocale(
- ::rtl::OUString::createFromAscii("zh"),
- ::rtl::OUString::createFromAscii("TW"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TW")));
return aLocale;
}
diff --git a/comphelper/source/streaming/otransactedfilestream.cxx b/comphelper/source/streaming/otransactedfilestream.cxx
index 1ec11f4..9b1f15c 100644
--- a/comphelper/source/streaming/otransactedfilestream.cxx
+++ b/comphelper/source/streaming/otransactedfilestream.cxx
@@ -304,9 +304,9 @@ void OTruncatedTransactedFileStream::Commit_Impl()
::rtl::OUString aTempURL;
try {
uno::Reference< beans::XPropertySet > xTempFile( m_pStreamData->m_xTempStream, uno::UNO_QUERY_THROW );
- uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+ uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")) );
aUrl >>= aTempURL;
- xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ),
+ xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")),
uno::makeAny( sal_False ) );
m_pStreamData->m_xTempSeekable->seek( nPos );
diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index ede81bb..8a36c31 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.cxx
@@ -102,7 +102,7 @@ void OSeekableInputWrapper::PrepareCopy_Impl()
throw uno::RuntimeException();
uno::Reference< io::XOutputStream > xTempOut(
- m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+ m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
uno::UNO_QUERY );
if ( xTempOut.is() )
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index ae45258..507de98 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -223,7 +223,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com
throw frame::DoubleInitializationException();
if ( aArguments.getLength() != 1 )
- throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong number of arguments!\n" ),
+ throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong number of arguments!\n")),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
@@ -239,7 +239,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com
m_bInitialized = sal_True;
}
else
- throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Unexpected type of argument!\n" ),
+ throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unexpected type of argument!\n")),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
}
More information about the Libreoffice-commits
mailing list