From 2aaa833a5b55dd8c2a7a59bcb4696d336d8e3744 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Sun, 21 Nov 2010 13:48:30 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in libs core 41 --- svx/source/form/navigatortree.cxx | 2 +- svx/source/form/xfm_addcondition.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 6 +++--- .../unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 4 ++-- svx/source/unodraw/unoshap4.cxx | 2 +- svx/source/xml/xmlexport.cxx | 2 +- svx/source/xml/xmlgrhlp.cxx | 2 +- svx/workben/msview/xmlconfig.cxx | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'svx') diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 3ad5abe6cf..8e9853bf23 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1560,7 +1560,7 @@ namespace svxform aNewName = aBaseName; if( i>0 ) { - aNewName += ::rtl::OUString::createFromAscii(" "); + aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aNewName += ::rtl::OUString::valueOf(i).getStr(); } diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 90c5581d87..1911c06f81 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -72,7 +72,7 @@ namespace svxform //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName() { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.OAddConditionDialog" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.OAddConditionDialog")); } //==================================================================== diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index fc53228e40..ce83d7a3a8 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -433,16 +433,16 @@ void SvxStyleBox_Impl::Select() Sequence< PropertyValue > aArgs( 2 ); aArgs[0].Value = makeAny( OUString( aSelEntry ) ); - aArgs[1].Name = OUString::createFromAscii( "Family" ); + aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Family")); aArgs[1].Value = makeAny( sal_Int16( eStyleFamily )); if( bCreateNew ) { - aArgs[0].Name = OUString::createFromAscii( "Param" ); + aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Param")); SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs); } else { - aArgs[0].Name = OUString::createFromAscii( "Template" ); + aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Template")); SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs ); } } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index ce24a3af25..b0706e5af7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -52,8 +52,8 @@ namespace textconversiondlgs //............................................................................. using namespace ::com::sun::star; -#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.linguistic2.ChineseTranslationDialog") -#define SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog") +#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.linguistic2.ChineseTranslationDialog")) +#define SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog")) #define C2U(cChar) rtl::OUString::createFromAscii(cChar) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index f4bfea185f..78316db8ae 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -523,7 +523,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aMediaDescr[0].Value <<= aLinkURL; uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler(); diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 467cc97c5c..f7efb61e2d 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -228,7 +228,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference xParser( xServiceFactory->createInstance( OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY ); + Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); // prepare filter arguments diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 32bfaae8bb..e9e8fcd094 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -605,7 +605,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny ); } - const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString::createFromAscii( "image/tiff" ) ) ); + const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) ); aAny <<= bCompressed; xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny ); diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 721233cc0b..fa47e4bace 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -328,7 +328,7 @@ void load_config( const OUString& rPath ) // get parser Reference< XParser > xParser( comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY_THROW ); // get filter -- cgit v1.2.3