summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/drivers/mozab/MDriver.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MServices.cxx2
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx4
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx2
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx12
-rw-r--r--xmloff/source/style/prstylei.cxx10
6 files changed, 17 insertions, 17 deletions
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 3f930c03e9..6ca30dadf8 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -159,7 +159,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
STR_COULD_NOT_LOAD_LIB,
- "$libname$", ::rtl::OUString::createFromAscii( SVLIBRARY( "mozabdrv" ) )
+ "$libname$", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "mozabdrv" )) )
) );
::dbtools::throwGenericSQLException(sError,*this);
@@ -301,7 +301,7 @@ bool MozabDriver::ensureInit()
OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!");
- const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" ));
+ const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
// load the mozabdrv library
m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 24be4a1be7..41c9079914 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -162,7 +162,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
{
- const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" ));
+ const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
// load the dbtools library
oslModule s_hModule = osl_loadModuleRelative(
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 2e203c418c..0f24d8741b 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -740,8 +740,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString&
if (xDPS.is()) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
mxServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
? new SvXMLMetaDocumentContext(*this,
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index e25127d60e..8a4ab891c5 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -125,7 +125,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
// get filter component
xDocHandler = uno::Reference< xml::sax::XDocumentHandler >(
xFactory->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
aArgs),
uno::UNO_QUERY_THROW );
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 86fdac8283..acf935186b 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -65,13 +65,13 @@ SvXMLImportContext* XMLMetaImportComponent::CreateContext(
IsXMLToken(rLocalName, XML_DOCUMENT_META) )
{
if (!mxDocProps.is()) {
- throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+ throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"XMLMetaImportComponent::CreateContext: setTargetDocument "
- "has not been called"), *this);
+ "has not been called")), *this);
}
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
return new SvXMLMetaDocumentContext(
*this, nPrefix, rLocalName, mxDocProps, xDocBuilder);
@@ -88,9 +88,9 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument(
{
mxDocProps = uno::Reference< document::XDocumentProperties >::query( xDoc );
if( !mxDocProps.is() )
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"XMLMetaImportComponent::setTargetDocument: argument is no "
- "XDocumentProperties"), uno::Reference<uno::XInterface>(*this), 0);
+ "XDocumentProperties")), uno::Reference<uno::XInterface>(*this), 0);
}
uno::Sequence< rtl::OUString > SAL_CALL
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index c11799ca21..554d39496b 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -209,15 +209,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
aValues.realloc( nLen + 2 );
PropertyValue *pProps = aValues.getArray() + nLen;
- pProps->Name = rtl::OUString::createFromAscii("ParaStyleName");
+ pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
OUString sParent( GetParentName() );
if( sParent.getLength() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
else
- sParent = rtl::OUString::createFromAscii("Standard");
+ sParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
pProps->Value <<= sParent;
++pProps;
- pProps->Name = rtl::OUString::createFromAscii("ParaConditionalStyleName");
+ pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName"));
pProps->Value <<= sParent;
}
@@ -226,8 +226,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
Sequence< OUString > aPropNames(1);
aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ?
- rtl::OUString::createFromAscii("ParaAutoStyleName") :
- rtl::OUString::createFromAscii("CharAutoStyleName");
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName")) :
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName"));
Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
if( aAny.hasElements() )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 06:23:50 +0000