[Libreoffice-commits] .: cui/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Nov 23 22:24:49 PST 2010
cui/source/customize/cfg.cxx | 62 +++++++++++++++++++-------------------
cui/source/customize/eventdlg.cxx | 6 +--
cui/source/customize/selector.cxx | 20 ++++++------
cui/source/dialogs/cuigaldlg.cxx | 6 +--
cui/source/dialogs/hlmarkwn.cxx | 6 +--
cui/source/dialogs/thesdlg.cxx | 2 -
cui/source/options/optgdlg.cxx | 52 +++++++++++++++----------------
cui/source/options/optsave.cxx | 4 +-
8 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 2448cfe1de708e82c7b33a454763ddf596c7b6d2
Author: Julien Nabet <serval at ilapharm.com>
Date: Tue Nov 23 22:10:46 2010 +0100
RTL patch for cui
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 430badc..7f08377 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -213,7 +213,7 @@ OUString replaceSaveInName(
const OUString& rSaveInName )
{
OUString name;
- OUString placeholder = OUString::createFromAscii( "%SAVE IN SELECTION%" );
+ OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%SAVE IN SELECTION%" ));
sal_Int32 pos = rMessage.indexOf( placeholder );
@@ -253,10 +253,10 @@ generateCustomName(
{
// find and replace the %n placeholder in the prefix string
OUString name;
- OUString placeholder = OUString::createFromAscii( "%n" );
+ OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%n" ));
sal_Int32 pos = prefix.indexOf(
- OUString::createFromAscii( "%n" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "%n" )) );
if ( pos != -1 )
{
@@ -419,29 +419,29 @@ OUString GetModuleName( const OUString& aModuleId )
{
if ( aModuleId.equalsAscii( "com.sun.star.text.TextDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) )
- return OUString::createFromAscii("Writer");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer"));
else if ( aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) )
- return OUString::createFromAscii("Writer/Web");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web"));
else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
- return OUString::createFromAscii("Draw");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw"));
else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
- return OUString::createFromAscii("Impress");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress"));
else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
- return OUString::createFromAscii("Calc");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc"));
else if ( aModuleId.equalsAscii( "com.sun.star.script.BasicIDE" ) )
- return OUString::createFromAscii("Basic");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) )
- return OUString::createFromAscii("Math");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Math"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) )
- return OUString::createFromAscii("Relation Design");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) )
- return OUString::createFromAscii("Query Design");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) )
- return OUString::createFromAscii("Table Design");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) )
- return OUString::createFromAscii("Data Source Browser" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" ));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) )
- return OUString::createFromAscii("Database" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" ));
return ::rtl::OUString();
}
@@ -924,7 +924,7 @@ SaveInData::SaveInData(
::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
xProps->getPropertyValue(
- OUString::createFromAscii( "DefaultContext" ))
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )))
>>= m_xComponentContext;
m_aSeparatorSeq.realloc( 1 );
@@ -1704,7 +1704,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
OUString aModuleName = GetUIModuleName( aModuleId, xModuleManager );
OUString title = aTopLevelSeparator.GetText();
- OUString aSearchString = OUString::createFromAscii( "%MODULENAME" );
+ OUString aSearchString(RTL_CONSTASCII_USTRINGPARAM( "%MODULENAME" ));
sal_Int32 index = title.indexOf( aSearchString );
if ( index != -1 )
@@ -1742,7 +1742,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
OUString label;
utl::ConfigManager::GetDirectConfigProperty(
utl::ConfigManager::PRODUCTNAME ) >>= label;
- label += OUString::createFromAscii( " " );
+ label += OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
label += aModuleName;
nPos = aSaveInListBox.InsertEntry( label );
@@ -3111,7 +3111,7 @@ SvxConfigEntry::GetHelpText()
{
if ( aHelpText.getLength() == 0 )
{
- OUString helpid = OUString::createFromAscii( "helpid:" );
+ OUString helpid(RTL_CONSTASCII_USTRINGPARAM( "helpid:" ));
if ( aHelpURL.indexOf( helpid ) != -1 )
{
aHelpURL = aHelpURL.copy( helpid.getLength() );
@@ -3349,7 +3349,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
// default toolbar to select is standardbar unless a different one
// has been passed in
m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL );
- m_aURLToSelect += OUString::createFromAscii( "standardbar" );
+ m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
const SfxPoolItem* pItem =
rSet.GetItem( rSet.GetPool()->GetWhich( SID_CONFIG ) );
@@ -3900,7 +3900,7 @@ void SvxToolbarConfigPage::Init()
// in future select the default toolbar: Standard
m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL );
- m_aURLToSelect += OUString::createFromAscii( "standardbar" );
+ m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
}
aTopLevelListBox.SelectEntryPos(nPos, TRUE);
@@ -4005,7 +4005,7 @@ void ToolbarSaveInData::SetSystemStyle(
const OUString& rResourceURL,
sal_Int32 nStyle )
{
- if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -4044,7 +4044,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL )
{
sal_Int32 result = 0;
- if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -4078,7 +4078,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
{
OUString result;
- if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -4104,7 +4104,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
}
}
- if ( rResourceURL.indexOf( OUString::createFromAscii( ".uno" ) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( ".uno" )) ) == 0 &&
m_xCommandToLabelMap.is() &&
m_xCommandToLabelMap->hasByName( rResourceURL ) )
{
@@ -5628,7 +5628,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
uno::Reference< beans::XPropertySet > props =
m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
uno::Any a = props->getPropertyValue(
- OUString::createFromAscii("SizePixel") );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) );
a >>= aSize;
if (0 == aSize.Width || 0 == aSize.Height)
return FALSE;
@@ -5772,9 +5772,9 @@ void SvxIconSelectorDialog::ImportGraphics(
if ( rejectedCount != 0 )
{
- OUString message =OUString::createFromAscii("");
- OUString newLine = OUString::createFromAscii("\n");
- rtl::OUString fPath = OUString::createFromAscii("");
+ OUString message;
+ OUString newLine(RTL_CONSTASCII_USTRINGPARAM("\n"));
+ OUString fPath;
if (rejectedCount > 1)
fPath = rPaths[0].copy(8) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) );
for ( sal_Int32 i = 0; i < rejectedCount; i++ )
@@ -5808,7 +5808,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
uno::Any a = props->getPropertyValue(
- OUString::createFromAscii("SizePixel") );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) );
xGraphic = m_xGraphProvider->queryGraphic( aMediaProps );
if ( xGraphic.is() )
@@ -5899,7 +5899,7 @@ rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMess
{
rtl::OUString name;
rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
- rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" );
+ rtl::OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%ICONNAME" ));
sal_Int32 pos = message.indexOf( placeholder );
if ( pos != -1 )
{
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index dffb651..bb957a6 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -97,8 +97,8 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
xSupplier = uno::Reference< document::XEventsSupplier > (
::comphelper::getProcessServiceFactory()->createInstance(
- OUString::createFromAscii(
- "com.sun.star.frame.GlobalEventBroadcaster" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.frame.GlobalEventBroadcaster" )) ),
uno::UNO_QUERY );
USHORT nPos(0);
@@ -202,7 +202,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
uno::Reference< frame::XFramesSupplier > xFramesSupplier(
::comphelper::getProcessServiceFactory()->createInstance(
- OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
uno::UNO_QUERY );
uno::Reference< frame::XFrame > xFrame =
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index d5552dd..08b2bab 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -476,8 +476,8 @@ void SvxConfigGroupListBox_Impl::Init()
Reference< ::com::sun::star::frame::XModuleManager >
xModuleManager( xMCF->createInstanceWithContext(
- OUString::createFromAscii(
- "com.sun.star.frame.ModuleManager" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.frame.ModuleManager" )),
xContext ),
UNO_QUERY );
@@ -489,8 +489,8 @@ void SvxConfigGroupListBox_Impl::Init()
Reference< container::XNameAccess > xNameAccess(
xMCF->createInstanceWithContext(
- OUString::createFromAscii(
- "com.sun.star.frame.UICommandDescription" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.frame.UICommandDescription" )),
xContext ),
UNO_QUERY );
@@ -501,8 +501,8 @@ void SvxConfigGroupListBox_Impl::Init()
Reference< container::XNameAccess > xAllCategories(
xMCF->createInstanceWithContext(
- OUString::createFromAscii(
- "com.sun.star.ui.UICategoryDescription" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.ui.UICategoryDescription" )),
xContext ),
UNO_QUERY );
@@ -584,7 +584,7 @@ void SvxConfigGroupListBox_Impl::Init()
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
xCtx.set( _xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
- OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
}
catch( const Exception& )
@@ -641,7 +641,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
xModuleManager(
xCtx->getServiceManager()
->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.frame.ModuleManager"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")),
xCtx ),
UNO_QUERY_THROW );
Reference<container::XNameAccess> xModuleConfig(
@@ -653,7 +653,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
Any aAny = xModuleConfig->getByName(appModule);
if( sal_True != ( aAny >>= moduleDescr ) )
{
- throw RuntimeException(OUString::createFromAscii("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
+ throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue")), Reference< XInterface >());
}
beans::PropertyValue const * pmoduleDescr =
moduleDescr.getConstArray();
@@ -697,7 +697,7 @@ SvxConfigGroupListBox_Impl::getDocumentModel(
xCtx->getServiceManager();
Reference< frame::XDesktop > desktop (
mcf->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), xCtx ),
UNO_QUERY );
Reference< container::XEnumerationAccess > componentsAccess =
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b90d838..24cc295 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -149,8 +149,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
Sequence< OUString > aProps( 2 );
- aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" );
- aProps.getArray()[ 1 ] = OUString::createFromAscii( "IsDocument" );
+ aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
+ aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ));
::com::sun::star::uno::Reference< XResultSet > xResultSet(
aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) );
@@ -1033,7 +1033,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
if( xMgr.is() )
{
xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >(
- xMgr->createInstance( OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" )), UNO_QUERY );
+ xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ))), UNO_QUERY );
if ( xFolderPicker.is() )
{
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 18d5b70..dd4b0f4 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -257,7 +257,7 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
if( xFactory.is() )
{
- uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+ uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
uno::UNO_QUERY );
if( xDesktop.is() )
{
@@ -272,9 +272,9 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
try
{
uno::Sequence< beans::PropertyValue > aArg(1);
- aArg.getArray()[0].Name = OUString::createFromAscii( "Hidden" );
+ aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
aArg.getArray()[0].Value <<= (sal_Bool) TRUE;
- xComp = xLoader->loadComponentFromURL( aURL, OUString::createFromAscii( "_blank" ), 0, aArg );
+ xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg );
}
catch( const io::IOException& )
{
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 6a99064..3abe771 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -543,7 +543,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale )
if (xLngMgr.is())
{
uno::Sequence< OUString > aServiceNames = xLngMgr->getConfiguredServices(
- OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
// there should be at most one thesaurus configured for each language
DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
if (aServiceNames.getLength() == 1)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d50f1f2..550123b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -570,30 +570,30 @@ CanvasSettings::CanvasSettings() :
Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
Reference<XMultiServiceFactory> xConfigProvider(
xFactory->createInstance(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
UNO_QUERY_THROW );
Any propValue(
makeAny( PropertyValue(
- OUString::createFromAscii("nodepath"), -1,
- makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
+ makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas")) ),
PropertyState_DIRECT_VALUE ) ) );
mxForceFlagNameAccess.set(
xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
Sequence<Any>( &propValue, 1 ) ),
UNO_QUERY_THROW );
propValue = makeAny(
PropertyValue(
- OUString::createFromAscii("nodepath"), -1,
- makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas/CanvasServiceList") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
+ makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas/CanvasServiceList")) ),
PropertyState_DIRECT_VALUE ) );
Reference<XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
Reference<XHierarchicalNameAccess> xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
@@ -610,7 +610,7 @@ CanvasSettings::CanvasSettings() :
if( xEntryNameAccess.is() )
{
Sequence<OUString> preferredImplementations;
- if( (xEntryNameAccess->getByName( OUString::createFromAscii("PreferredImplementations") ) >>= preferredImplementations) )
+ if( (xEntryNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredImplementations")) ) >>= preferredImplementations) )
maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) );
}
@@ -648,7 +648,7 @@ BOOL CanvasSettings::IsHardwareAccelerationAvailable() const
pCurrImpl->trim() ),
UNO_QUERY_THROW );
bool bHasAccel(false);
- if( (xPropSet->getPropertyValue(OUString::createFromAscii("HardwareAcceleration")) >>= bHasAccel) )
+ if( (xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("HardwareAcceleration"))) >>= bHasAccel) )
if( bHasAccel )
{
mbHWAccelAvailable = true;
@@ -675,7 +675,7 @@ BOOL CanvasSettings::IsHardwareAccelerationEnabled() const
if( !mxForceFlagNameAccess.is() )
return true;
- if( !(mxForceFlagNameAccess->getByName( OUString::createFromAscii("ForceSafeServiceImpl") ) >>= bForceLastEntry) )
+ if( !(mxForceFlagNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")) ) >>= bForceLastEntry) )
return true;
return !bForceLastEntry;
@@ -690,7 +690,7 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
if( !xNameReplace.is() )
return;
- xNameReplace->replaceByName( OUString::createFromAscii("ForceSafeServiceImpl"),
+ xNameReplace->replaceByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")),
makeAny(!_bEnabled) );
Reference< XChangesBatch > xChangesBatch(
@@ -1247,17 +1247,17 @@ struct LanguageConfig_Impl
static sal_Bool bLanguageCurrentDoc_Impl = sal_False;
// some things we'll need...
-static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
-static const OUString sAccessUpdSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
-static const OUString sInstalledLocalesPath = OUString::createFromAscii("org.openoffice.Setup/Office/InstalledLocales");
-static OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
-//static const OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office/Linguistic");
-static const OUString sUserLocaleKey = OUString::createFromAscii("UILocale");
-static const OUString sSystemLocalePath = OUString::createFromAscii("org.openoffice.System/L10N");
-static const OUString sSystemLocaleKey = OUString::createFromAscii("UILocale");
-static const OUString sOfficeLocalePath = OUString::createFromAscii("org.openoffice.Office/L10N");
-static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale");
+static const OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"));
+static const OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess"));
+static const OUString sAccessUpdSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
+static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/InstalledLocales"));
+static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General"));
+//static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic"));
+static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
+static const OUString sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N"));
+static const OUString sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
+static const OUString sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N"));
+static const OUString sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
static Sequence< OUString > seqInstalledLanguages;
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
@@ -1317,8 +1317,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
Reference< XNameAccess > theNameAccess;
// find out which locales are currently installed and add them to the listbox
- theArgs[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sInstalledLocalesPath)));
- theArgs[1] = makeAny(NamedValue(OUString::createFromAscii("reload"), makeAny(sal_True)));
+ theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sInstalledLocalesPath)));
+ theArgs[1] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("reload")), makeAny(sal_True)));
theNameAccess = Reference< XNameAccess > (
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
seqInstalledLanguages = theNameAccess->getElementNames();
@@ -1337,7 +1337,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
// find out whether the user has a specific locale specified
Sequence< Any > theArgs2(1);
- theArgs2[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sUserLocalePath)));
+ theArgs2[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sUserLocalePath)));
theNameAccess = Reference< XNameAccess > (
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW );
if (theNameAccess->hasByName(sUserLocaleKey))
@@ -1527,7 +1527,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// tell quickstarter to stop being a veto listener
Reference< XInitialization > xInit(theMSF->createInstance(
- OUString::createFromAscii("com.sun.star.office.Quickstart")), UNO_QUERY);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))), UNO_QUERY);
if (xInit.is())
{
Sequence< Any > args(3);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 0143dd2..890c213 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -598,10 +598,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
while(xList->hasMoreElements())
{
SequenceAsHashMap aFilter(xList->nextElement());
- OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Name"),OUString());
+ OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString());
if (sFilter.getLength())
{
- sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Flags"),sal_Int32());
+ sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32());
lList.push_back(sFilter);
lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN));
lODFList.push_back( isODFFormat( sFilter ) );
More information about the Libreoffice-commits
mailing list