[Libreoffice-commits] .: sfx2/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Nov 20 16:11:39 PST 2010
sfx2/source/config/evntconf.cxx | 18 +++++++++---------
sfx2/source/doc/Metadatable.cxx | 32 ++++++++++++++++----------------
sfx2/source/doc/objuno.cxx | 8 ++++----
sfx2/source/inet/inettbc.cxx | 2 +-
sfx2/source/notify/eventsupplier.cxx | 14 +++++++-------
5 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 207c1b8bf6bb595dea09856c73f71788f0fa7249
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 01:11:13 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 34
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 91c8826..1944e94 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -180,17 +180,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
uno::Sequence < beans::PropertyValue > aProperties(3);
beans::PropertyValue *pValues = aProperties.getArray();
- ::rtl::OUString aType = ::rtl::OUString::createFromAscii( STAR_BASIC );;
+ ::rtl::OUString aType(RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
pValues[ 0 ].Value <<= aType;
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_LIBRARY );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
pValues[ 1 ].Value <<= aLib;
- pValues[ 2 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+ pValues[ 2 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
pValues[ 2 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -203,10 +203,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
pValues[ 0 ].Value <<= aLib;
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_SCRIPT );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -218,10 +218,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
- pValues[ 0 ].Value <<= ::rtl::OUString::createFromAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+ pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index f579fec..1df20fc 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -522,8 +522,8 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElement(
{
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId")), 0, 0);
}
const XmlIdList_t * pList( LookupElementList(i_rStreamName, i_rIdref) );
@@ -691,15 +691,15 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId")), 0, 0);
}
if (i_rObject.IsInContent()
? !isContentFile(i_rStreamName)
: !isStylesFile(i_rStreamName))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId: wrong stream"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId: wrong stream")), 0, 0);
}
::rtl::OUString old_path;
@@ -994,8 +994,8 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
{
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId")), 0, 0);
}
const ClipboardXmlIdMap_t::const_iterator iter( m_XmlIdMap.find(i_rIdref) );
@@ -1125,15 +1125,15 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId")), 0, 0);
}
if (i_rObject.IsInContent()
? !isContentFile(i_rStreamName)
: !isStylesFile(i_rStreamName))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId: wrong stream"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId: wrong stream")), 0, 0);
}
::rtl::OUString old_path;
@@ -1262,8 +1262,8 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
if (!isValidXmlId(i_rReference.First, i_rReference.Second))
{
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
- "illegal XmlId"), 0, 0);
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "illegal XmlId")), 0, 0);
}
if (!i_isLatent)
@@ -1355,8 +1355,8 @@ Metadatable::SetMetadataReference(
else
{
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Metadatable::"
- "SetMetadataReference: argument is invalid"), /*this*/0, 0);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metadatable::"
+ "SetMetadataReference: argument is invalid")), /*this*/0, 0);
}
}
}
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 04031bd..c681bbf 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -443,14 +443,14 @@ SfxDocumentInfoObject::initialize(const uno::Sequence< uno::Any > & aArguments)
uno::Any any = aArguments[0];
uno::Reference<document::XDocumentProperties> xDoc;
if (!(any >>= xDoc) || !xDoc.is()) throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(
- "SfxDocumentInfoObject::initialize: no XDocumentProperties given"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "SfxDocumentInfoObject::initialize: no XDocumentProperties given")),
*this, 0);
_pImp->Reset(xDoc);
} else {
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(
- "SfxDocumentInfoObject::initialize: no argument given"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "SfxDocumentInfoObject::initialize: no argument given")),
*this, 0);
}
}
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index d3581b0..c69bbca 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -124,7 +124,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) co
{
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
- aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+ aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
aArgs[1].Value = makeAny( ::rtl::OUString( aName ));
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index a94d288..07bfbfb 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -248,8 +248,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
::com::sun::star::uno::Reference
< ::com::sun::star::util::XURLTransformer > xTrans(
::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.util.URLTransformer" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.util.URLTransformer" )) ),
UNO_QUERY );
::com::sun::star::util::URL aURL;
@@ -270,8 +270,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
xProv = ::com::sun::star::uno::Reference
< ::com::sun::star::frame::XDispatchProvider > (
::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.frame.Desktop" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.frame.Desktop" )) ),
UNO_QUERY );
}
@@ -539,11 +539,11 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
aLibrary = String::CreateFromAscii("application");
}
- aOutProps[1].Name = OUSTRING::createFromAscii( PROP_SCRIPT );
+ aOutProps[1].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
aOutProps[1].Value <<= aScript;
- aOutProps[2].Name = OUSTRING::createFromAscii( PROP_LIBRARY );
+ aOutProps[2].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
aOutProps[2].Value <<= aLibrary;
- aOutProps[3].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME );
+ aOutProps[3].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
aOutProps[3].Value <<= aMacroName;
rRet <<= aOutProps;
}
More information about the Libreoffice-commits
mailing list