[Libreoffice-commits] .: sfx2/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Nov 20 15:01:48 PST 2010
sfx2/source/appl/newhelp.cxx | 2 +-
sfx2/source/dialog/mailmodel.cxx | 16 ++++++++--------
sfx2/source/doc/objmisc.cxx | 2 +-
sfx2/source/doc/objstor.cxx | 26 +++++++++++++-------------
sfx2/source/doc/objuno.cxx | 16 ++++++++--------
sfx2/source/doc/objxtor.cxx | 24 ++++++++++++------------
sfx2/source/doc/ownsubfilterservice.cxx | 6 +++---
sfx2/source/menu/mnumgr.cxx | 4 ++--
8 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 596239998565a201860a9035217ab9faac5b6b16
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 00:01:19 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 30
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5c957e3..da3b530 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -3091,7 +3091,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
// INetURLObject aObj(aEntry);
// BOOL bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
- BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+ BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
if (bComplete)
sHelpURL = ::rtl::OUString(aEntry);
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index f6a5f24..c3f0d25 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -173,7 +173,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG =
uno::Reference< container::XNameAccess >(
xSMGR->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ), uno::UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ), uno::UNO_QUERY );
css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY );
if ( !xFilterCFG.is() )
@@ -186,7 +186,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
sal_Int32 nPropertyCount = aProps.getLength();
for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
{
- if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii( "UIComponent" )) )
+ if( aProps[nProperty].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
{
::rtl::OUString aServiceName;
aProps[nProperty].Value >>= aServiceName;
@@ -233,7 +233,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
//add them to the args
for ( sal_Int32 nInd = 0; nInd < aPropsFromDialog.getLength(); nInd++ )
{
- if( aPropsFromDialog[ nInd ].Name.equals( ::rtl::OUString::createFromAscii( "FilterData" ) ) )
+ if( aPropsFromDialog[ nInd ].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData")) ) )
{
//found the filterdata, add to the storing argument
rArgs.realloc( ++rNumArgs );
@@ -393,7 +393,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
{
::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "Name" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
::rtl::OUString() );
}
@@ -432,7 +432,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
{
::comphelper::SequenceAsHashMap aFilterPropsHM( xNameAccess->getByName( aModule ) );
aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "ooSetupFactoryDefaultFilter" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter")),
::rtl::OUString() );
css::uno::Reference< css::container::XNameAccess > xNameAccess2(
xContainerQuery, css::uno::UNO_QUERY );
@@ -440,7 +440,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
{
::comphelper::SequenceAsHashMap aFilterPropsHM2( xNameAccess2->getByName( aFilterName ) );
aTypeName = aFilterPropsHM2.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "Type" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")),
::rtl::OUString() );
}
}
@@ -479,7 +479,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
{
::comphelper::SequenceAsHashMap aTypeNamePropsHM( xTypeDetection->getByName( aTypeName ) );
uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "Extensions" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")),
::uno::Sequence< ::rtl::OUString >() );
if ( aExtensions.getLength() )
aExtension = aExtensions[0];
@@ -849,7 +849,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
OUString baseName( maAttachedDocuments[0].copy( maAttachedDocuments[0].lastIndexOf( '/' ) + 1 ) );
OUString subject( baseName );
if ( maAttachedDocuments.size() > 1 )
- subject += OUString::createFromAscii( ", ..." );
+ subject += OUString(RTL_CONSTASCII_USTRINGPARAM(", ..."));
xSimpleMailMessage->setSubject( subject );
}
xSimpleMailMessage->setAttachement( aAttachmentSeq );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a42d1db..b4bdacd 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1728,7 +1728,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
{
Sequence< uno::Any > aArgs( 1 );
aArgs[ 0 ] = *pCaller;
- xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
+ xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Caller")), uno::makeAny( aArgs ) );
}
}
aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ce99027..86c46f3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -163,7 +163,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >&
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
css::uno::Reference< css::container::XSet > xModelCollection(
- xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster")),
+ xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))),
css::uno::UNO_QUERY);
if (xModelCollection.is())
{
@@ -223,7 +223,7 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
try
{
uno::Reference< embed::XStorage > xVersion = xDocStorage->openStorageElement(
- ::rtl::OUString::createFromAscii( "Versions" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Versions")),
embed::ElementModes::READWRITE );
DBG_ASSERT( xVersion.is(),
@@ -335,7 +335,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
{
try
{
- xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aDataFlavor.MimeType ) );
+ xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny( aDataFlavor.MimeType ) );
}
catch( uno::Exception& )
{
@@ -354,7 +354,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
{
try
{
- xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "Version" ), uno::makeAny( aVersion ) );
+ xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version")), uno::makeAny( aVersion ) );
}
catch( uno::Exception& )
{
@@ -686,7 +686,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) )
{
uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY );
- ::rtl::OUString sLockUpdates(::rtl::OUString::createFromAscii("LockUpdates"));
+ ::rtl::OUString sLockUpdates(RTL_CONSTASCII_USTRINGPARAM("LockUpdates"));
bool bSetProperty = true;
try
{
@@ -827,7 +827,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
if( xServiceManager.is() )
{
xFilterCFG = com::sun::star::uno::Reference< XNameAccess >(
- xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+ xServiceManager->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ),
UNO_QUERY );
}
@@ -842,7 +842,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
{
sal_Int32 nPropertyCount = aProps.getLength();
for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
- if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii("UIComponent")) )
+ if( aProps[nProperty].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
{
::rtl::OUString aServiceName;
aProps[nProperty].Value >>= aServiceName;
@@ -1307,7 +1307,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
if ( !xProps.is() )
throw uno::RuntimeException();
- xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ),
+ xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
uno::makeAny( aDataFlavor.MimeType ) );
}
catch( uno::Exception& )
@@ -2718,7 +2718,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
BOOL bWasReadonly = IsReadOnly();
- if ( aURL == aActName && aURL != INetURLObject( OUString::createFromAscii( "private:stream" ) )
+ if ( aURL == aActName && aURL != INetURLObject( OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")) )
&& IsReadOnly() )
{
SetError(ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
@@ -3592,12 +3592,12 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail( sal_Bool bEncrypted,
try {
uno::Reference< embed::XStorage > xThumbnailStor =
- xStor->openStorageElement( ::rtl::OUString::createFromAscii( "Thumbnails" ),
+ xStor->openStorageElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnails")),
embed::ElementModes::READWRITE );
if ( xThumbnailStor.is() )
{
uno::Reference< io::XStream > xStream = xThumbnailStor->openStreamElement(
- ::rtl::OUString::createFromAscii( "thumbnail.png" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("thumbnail.png")),
embed::ElementModes::READWRITE );
if ( xStream.is() && WriteThumbnail( bEncrypted, bSigned, bIsTemplate, xStream ) )
@@ -3630,8 +3630,8 @@ sal_Bool SfxObjectShell::WriteThumbnail( sal_Bool bEncrypted,
uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
if ( xSet.is() )
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("MediaType"),
- uno::makeAny( ::rtl::OUString::createFromAscii("image/png") ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
+ uno::makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png")) ) );
if ( bEncrypted )
{
sal_uInt16 nResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl(
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index b54b233..04031bd 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -394,13 +394,13 @@ void SfxDocumentInfoObject_Impl::Reset(uno::Reference<document::XDocumentPropert
: sName + ::rtl::OUString::valueOf(i+1);
while (std::find(names.begin(), names.end(), name)
!= names.end()) {
- name += ::rtl::OUString::createFromAscii("'");
+ name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
}
// FIXME there is a race condition here
try {
xPropContainer->addProperty(name,
beans::PropertyAttribute::REMOVEABLE,
- uno::makeAny(::rtl::OUString::createFromAscii("")));
+ uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))));
} catch (uno::RuntimeException) {
throw;
} catch (uno::Exception) {
@@ -888,7 +888,7 @@ void SAL_CALL SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
_pImp->m_xDocProps->setAutoloadSecs(60); // default
} else if ( !bBoolVal && (0 != _pImp->m_xDocProps->getAutoloadSecs()) ) {
_pImp->m_xDocProps->setAutoloadSecs(0);
- _pImp->m_xDocProps->setAutoloadURL(::rtl::OUString::createFromAscii(""));
+ _pImp->m_xDocProps->setAutoloadURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")));
}
break;
default:
@@ -1141,7 +1141,7 @@ void SAL_CALL SfxDocumentInfoObject::setUserFieldName(sal_Int16 nIndex, const :
try {
xPropContainer->addProperty(aName,
beans::PropertyAttribute::REMOVEABLE,
- uno::makeAny(::rtl::OUString::createFromAscii("")));
+ uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))));
_pImp->m_UserDefined[nIndex] = aName;
} catch (beans::PropertyExistException) {
_pImp->m_UserDefined[nIndex] = aName;
@@ -1310,9 +1310,9 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin
try
{
uno::Sequence<beans::PropertyValue> medium(2);
- medium[0].Name = ::rtl::OUString::createFromAscii("DocumentBaseURL");
+ medium[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBaseURL"));
medium[0].Value <<= aURL;
- medium[1].Name = ::rtl::OUString::createFromAscii("URL");
+ medium[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
medium[1].Value <<= aURL;
_pImp->m_xDocProps->loadFromStorage(xStorage, medium);
_pImp->Reset(_pImp->m_xDocProps);
@@ -1350,9 +1350,9 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::storeIntoURL(const ::rtl::OUStri
try
{
uno::Sequence<beans::PropertyValue> medium(2);
- medium[0].Name = ::rtl::OUString::createFromAscii("DocumentBaseURL");
+ medium[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBaseURL"));
medium[0].Value <<= aURL;
- medium[1].Name = ::rtl::OUString::createFromAscii("URL");
+ medium[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
medium[1].Value <<= aURL;
_pImp->m_xDocProps->storeToStorage(xStorage, medium);
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index df9fc97..a5fe210 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -970,43 +970,43 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact )
if ( aFact.EqualsAscii("swriter") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
}
else if ( aFact.EqualsAscii("sweb") || aFact.EqualsAscii("swriter/web") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"));
}
else if ( aFact.EqualsAscii("sglobal") || aFact.EqualsAscii("swriter/globaldocument") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"));
}
else if ( aFact.EqualsAscii("scalc") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"));
}
else if ( aFact.EqualsAscii("sdraw") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
}
else if ( aFact.EqualsAscii("simpress") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
}
else if ( aFact.EqualsAscii("schart") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.chart.ChartDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartDocument"));
}
else if ( aFact.EqualsAscii("smath") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.formula.FormulaProperties"));
}
else if ( aFact.EqualsAscii("sbasic") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.script.BasicIDE");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.BasicIDE"));
}
else if ( aFact.EqualsAscii("sdatabase") )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.OfficeDatabaseDocument");
+ aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"));
}
return aServiceName;
@@ -1054,7 +1054,7 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte
SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
::rtl::OUString aURL;
- ::rtl::OUString aTarget = rtl::OUString::createFromAscii("_blank");
+ ::rtl::OUString aTarget(RTL_CONSTASCII_USTRINGPARAM("_blank"));
if ( pFileNameItem )
aURL = pFileNameItem->GetValue();
if ( pTargetItem )
@@ -1067,7 +1067,7 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte
}
else
xLoader = uno::Reference < frame::XComponentLoader >( comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), uno::UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY );
Reference <lang::XComponent> xComp;
try
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 0550c27..005ca6f 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -54,15 +54,15 @@ OwnSubFilterService::~OwnSubFilterService()
uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.OwnSubFilter");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.document.OwnSubFilter");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OwnSubFilter"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.document.OwnSubFilter"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.document.OwnSubFilter");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.document.OwnSubFilter"));
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 276f443..6a46996 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -242,7 +242,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
pThesSubMenu->InsertItem( nId, aItemText );
- ::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) );
+ ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusFromContext?WordReplace:string=") );
aCmd += aItemText;
pThesSubMenu->SetItemCommand( nId, aCmd );
@@ -258,7 +258,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
pThesSubMenu->InsertSeparator();
const String sThesaurus( SfxResId( STR_MENU_THESAURUS ) );
pThesSubMenu->InsertItem( 100, sThesaurus );
- pThesSubMenu->SetItemCommand( 100, ::rtl::OUString::createFromAscii( ".uno:ThesaurusDialog" ) );
+ pThesSubMenu->SetItemCommand( 100, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusDialog")) );
pSVMenu->InsertSeparator();
const String sSynonyms( SfxResId( STR_MENU_SYNONYMS ) );
More information about the Libreoffice-commits
mailing list