summaryrefslogtreecommitdiff
path: root/framework/source/services
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-20 12:20:55 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-20 12:20:55 +0100
commitbc724f0c0062f0d76f9f9412ca5581b4cd0d115d (patch)
treef4737a923898b6abc15c4fa0151fd7b50fc9af18 /framework/source/services
parent82e54f6a8f96840b894efb30be5279767e709d4f (diff)
TL_CONSTASCII_USTRINGPARAM in libs core 24
Diffstat (limited to 'framework/source/services')
-rw-r--r--framework/source/services/backingcomp.cxx16
-rw-r--r--framework/source/services/backingwindow.cxx10
-rw-r--r--framework/source/services/dispatchhelper.cxx2
-rw-r--r--framework/source/services/frame.cxx6
-rw-r--r--framework/source/services/license.cxx28
-rw-r--r--framework/source/services/modulemanager.cxx14
-rw-r--r--framework/source/services/sessionlistener.cxx12
-rw-r--r--framework/source/services/tabwindowservice.cxx4
-rw-r--r--framework/source/services/urltransformer.cxx2
9 files changed, 47 insertions, 47 deletions
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index f7d65fa26498..e7e7dc7a8fec 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -462,17 +462,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
// check some required states
if (m_xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("already attached"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")),
static_cast< ::cppu::OWeakObject* >(this));
if (!xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("invalid frame reference"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")),
static_cast< ::cppu::OWeakObject* >(this));
if (!m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")),
static_cast< ::cppu::OWeakObject* >(this));
// safe the frame reference
@@ -661,7 +661,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("unexpected source or called twice"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")),
static_cast< ::cppu::OWeakObject* >(this));
m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -755,7 +755,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
throw(css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("not supported"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -802,7 +802,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (m_xWindow.is())
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("already initialized"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")),
static_cast< ::cppu::OWeakObject* >(this));
css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -813,7 +813,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
)
{
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("wrong or corrupt argument list"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -824,7 +824,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (!m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("couldn't create component window"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")),
static_cast< ::cppu::OWeakObject* >(this));
// start listening for window disposing
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 94d9dfae0c1e..deec5163aea4 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -993,8 +993,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs );
}
@@ -1004,8 +1004,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs );
}
@@ -1084,7 +1084,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
aDispatchURL.Complete = i_rURL;
Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
- comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+ comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
com::sun::star::uno::UNO_QUERY );
if ( xURLTransformer.is() )
{
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index e41b91d1302d..629ebe735035 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -148,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
sal_Int32 nLength = lArguments.getLength();
aArguments.realloc( nLength + 1 );
- aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode");
+ aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
css::uno::Any aResult;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 7113181372bd..67adb5242c0c 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -557,7 +557,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
if (!xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")),
static_cast< css::frame::XFrame* >(this));
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -565,7 +565,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
if ( m_xContainerWindow.is() )
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")),
static_cast< css::frame::XFrame* >(this));
// Look for rejected calls first!
@@ -2614,7 +2614,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
const css::uno::Any& aValue )
{
- static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title");
+ static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"));
/* There is no need to lock any mutex here. Because we share the
solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-)
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 7f7c2980eced..a4fba2983e8d 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -211,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
sal_Int32 nDateLength = 10;
sal_Int32 nTimeLength = 8;
- ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T");
- ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-");
- ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":");
- ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z");
+ ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+ ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+ ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+ ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -276,11 +276,11 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aLangString = aLocale.Language;
if ( aLocale.Country.getLength() != 0 )
{
- aLangString += ::rtl::OUString::createFromAscii("-");
+ aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
aLangString += aLocale.Country;
if ( aLocale.Variant.getLength() != 0 )
{
- aLangString += ::rtl::OUString::createFromAscii("-");
+ aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
aLangString += aLocale.Variant;
}
}
@@ -288,21 +288,21 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
::rtl::OUString aLicensePath =
aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
+ ::rtl::OUString::createFromAscii(szWNTLicenseName)
- + ::rtl::OUString::createFromAscii("_")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
+ aLangString
+ ::rtl::OUString::createFromAscii(szWNTLicenseExt);
#else
::rtl::OUString aLicensePath =
aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
+ ::rtl::OUString::createFromAscii(szUNXLicenseName)
- + ::rtl::OUString::createFromAscii("_")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
+ aLangString
+ ::rtl::OUString::createFromAscii(szUNXLicenseExt);
#endif
// check if we need to show the license at all
// open org.openoffice.Setup/Office/ooLicenseAcceptDate
::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER;
- ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+ ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
::rtl::OUString sReadSrvc = SERVICENAME_CFGREADACCESS;
// get configuration provider
@@ -310,15 +310,15 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
Sequence< Any > theArgs(1);
NamedValue v;
- v.Name = ::rtl::OUString::createFromAscii("NodePath");
- v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office");
+ v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+ v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office"));
theArgs[0] <<= v;
Reference< XPropertySet > pset = Reference< XPropertySet >(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
// if we find a date there, compare it to baseinstall license date
::rtl::OUString aAcceptDate;
- if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate)
+ if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate)
{
// get LicenseFileDate from base install
::rtl::OUString aLicenseURL = aLicensePath;
@@ -356,7 +356,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
// write org.openoffice.Setup/ooLicenseAcceptDate
aAcceptDate = _getCurrentDateString();
- pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+ pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate));
Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
// enable quickstarter
@@ -367,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aSeq[1] <<= bAutostart;
Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY );
if ( xQuickstart.is() )
xQuickstart->initialize( aSeq );
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 86c6c030ffc3..d394b305bad3 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -56,8 +56,8 @@
namespace framework
{
-static const ::rtl::OUString CFGPATH_FACTORIES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" );
+static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
/*-----------------------------------------------
04.12.2003 09:32
@@ -146,7 +146,7 @@ ModuleManager::~ModuleManager()
)
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
}
@@ -176,7 +176,7 @@ ModuleManager::~ModuleManager()
if (sModule.getLength() < 1)
throw css::frame::UnknownModuleException(
- ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")),
static_cast< ::cppu::OWeakObject* >(this));
return sModule;
@@ -196,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (lProps.empty() )
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("No properties given to replace part of module."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")),
static_cast< css::container::XNameAccess* >(this),
2);
}
@@ -223,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
static_cast< css::container::XNameAccess* >(this));
}
@@ -258,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
static_cast< css::container::XNameAccess* >(this));
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ccf17e45a630..181cda0b0df4 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -164,7 +164,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"));
xURLTransformer->parseStrict(aURL);
// in case of asynchronous call the notification will trigger saveDone()
@@ -172,7 +172,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
xDispatch->addStatusListener(this, aURL);
Sequence< PropertyValue > args(1);
- args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
+ args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -196,11 +196,11 @@ void SessionListener::QuitSessionQuietly()
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionQuietQuit"));
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args(1);
- args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
+ args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -216,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
throw (RuntimeException)
{
- OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient");
+ OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
if (args.getLength() > 0)
{
NamedValue v;
@@ -273,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"));
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args;
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 5a0c45fc9a48..641328f69be3 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -441,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
)
{
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
}
}
@@ -455,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
if (pIt == m_lTabPageInfos.end ())
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
return pIt;
}
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 16c5dae13072..01e52f0f30cd 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
if ( !bWithPassword && aTestURL.Password.getLength() > 0 )
{
// Exchange password text with other placeholder string
- aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" );
+ aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>"));
assemble( aTestURL );
}