[Libreoffice-commits] .: ucb/workben xmloff/source xmlscript/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 21 08:45:47 PST 2010
ucb/workben/ucb/ucbdemo.cxx | 28 ++++++++++-----------
xmloff/source/core/xmlexp.cxx | 2 -
xmloff/source/meta/xmlmetai.cxx | 4 +--
xmloff/source/style/xmlnumfi.cxx | 2 -
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 2 -
5 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 42321f12d9f58c247703e742d23d99750cf716fc
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 17:45:09 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs core 47
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index a8d90b6..d1b4f5e 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -396,7 +396,7 @@ rtl::OUString Ucb::m_aProtocol;
// static
rtl::OUString Ucb::getUnoURL()
{
- rtl::OUString aUnoURL(rtl::OUString::createFromAscii(
+ rtl::OUString aUnoURL(RTL_CONSTASCII_USTRINGPARAM(
"uno:socket,host=localhost,port=8121;"));
if (m_aProtocol.getLength() == 0)
aUnoURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("urp"));
@@ -659,8 +659,8 @@ uno::Any UcbCommandProcessor::executeCommand( const rtl::OUString& rName,
= uno::Reference< task::XInteractionHandler >(
m_rUCB.getServiceFactory()->
createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.task.InteractionHandler")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.task.InteractionHandler"))),
uno::UNO_QUERY);
uno::Reference< ucb::XProgressHandler >
xProgressHandler(new ProgressHandler(m_rUCB));
@@ -1022,9 +1022,9 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
m_rUCB.
getServiceFactory()->
createInstance(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.ucb.SortedDynamic"
- "ResultSetFactory")),
+ "ResultSetFactory"))),
uno::UNO_QUERY);
uno::Reference< ucb::XDynamicResultSet > xSorted;
if (xSortedFactory.is())
@@ -1062,8 +1062,8 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
try
{
xProperties->
- setPropertyValue(rtl::OUString::createFromAscii(
- "FetchSize"),
+ setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "FetchSize")),
uno::makeAny(nFetchSize));
bSet = true;
}
@@ -1310,8 +1310,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove )
//rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewTitle")),
ucb::NameClash::ERROR );
- ucb::Command aTransferCommand( rtl::OUString::createFromAscii(
- "globalTransfer" ),
+ ucb::Command aTransferCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "globalTransfer" )),
-1,
uno::makeAny( aArg ) );
@@ -1321,8 +1321,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove )
= uno::Reference< task::XInteractionHandler >(
m_rUCB.getServiceFactory()->
createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.task.InteractionHandler")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.task.InteractionHandler"))),
uno::UNO_QUERY);
uno::Reference< ucb::XProgressHandler > xProgressHandler(
new ProgressHandler(m_rUCB));
@@ -2287,7 +2287,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
case MYWIN_ITEMID_REORGANIZE:
if ( m_pContent )
m_pContent->executeCommand (
- rtl::OUString::createFromAscii ("reorganizeData"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("reorganizeData")),
uno::Any());
else
print( "No content!" );
@@ -2449,9 +2449,9 @@ void MyApp::Main()
// Read command line params.
//////////////////////////////////////////////////////////////////////
- rtl::OUString aConfigurationKey1(rtl::OUString::createFromAscii(
+ rtl::OUString aConfigurationKey1(RTL_CONSTASCII_USTRINGPARAM(
UCB_CONFIGURATION_KEY1_LOCAL));
- rtl::OUString aConfigurationKey2(rtl::OUString::createFromAscii(
+ rtl::OUString aConfigurationKey2(RTL_CONSTASCII_USTRINGPARAM(
UCB_CONFIGURATION_KEY2_OFFICE));
USHORT nParams = Application::GetCommandLineParamCount();
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index e6a0efa..45413cf 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1274,7 +1274,7 @@ lcl_AddGrddl(SvXMLExport & rExport, const sal_Int32 nExportMode)
if (EXPORT_SETTINGS != nExportMode) // meta, content, styles
{
rExport.AddAttribute( XML_NAMESPACE_GRDDL, XML_TRANSFORMATION,
- OUString::createFromAscii(s_grddl_xsl) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(s_grddl_xsl)) );
}
}
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index fd37b42..62d738c 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -200,9 +200,9 @@ void SvXMLMetaDocumentContext::initDocumentProperties()
throw;
} catch (uno::Exception & e) {
throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString::createFromAscii(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"SvXMLMetaDocumentContext::initDocumentProperties: "
- "properties init exception"),
+ "properties init exception")),
GetImport(), makeAny(e));
}
}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 4953452..1bc2957 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -893,7 +893,7 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat
{
// A quote is turned into "\"" - a quote to end quoted text, an escaped quote,
// and a quote to resume quoting.
- rtl::OUString aInsert( rtl::OUString::createFromAscii( "\"\\\"" ) );
+ rtl::OUString aInsert( RTL_CONSTASCII_USTRINGPARAM( "\"\\\"" ) );
sal_Int32 nPos = 0;
while ( nPos < rContent.getLength() )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 4baa8f2..f9ceaae 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -130,7 +130,7 @@ Reference< xml::input::XElement > MultiPage::startChildElement(
throw (xml::sax::SAXException, RuntimeException)
{
// event
-rtl::OUString _label = rtl::OUString::createFromAscii("foo");
+rtl::OUString _label(RTL_CONSTASCII_USTRINGPARAM("foo"));
if (_pImport->isEventElement( nUid, rLocalName ))
{
return new EventElement(
More information about the Libreoffice-commits
mailing list