[Libreoffice-commits] .: 3 commits - framework/inc framework/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Nov 20 05:19:13 PST 2010
framework/inc/macros/xserviceinfo.hxx | 2
framework/source/accelerators/acceleratorconfiguration.cxx | 54 +++++-----
framework/source/accelerators/acceleratorexecute.cxx | 2
framework/source/accelerators/documentacceleratorconfiguration.cxx | 2
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 6 -
framework/source/accelerators/presethandler.cxx | 8 -
framework/source/accelerators/storageholder.cxx | 2
framework/source/classes/fwktabwindow.cxx | 11 --
framework/source/classes/taskcreator.cxx | 6 -
framework/source/dispatch/dispatchinformationprovider.cxx | 2
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/dispatch/menudispatcher.cxx | 2
framework/source/dispatch/oxt_handler.cxx | 2
framework/source/dispatch/windowcommanddispatch.cxx | 4
framework/source/helper/mischelper.cxx | 2
framework/source/helper/oframes.cxx | 2
framework/source/helper/persistentwindowstate.cxx | 8 -
framework/source/helper/statusindicatorfactory.cxx | 8 -
framework/source/helper/titlebarupdate.cxx | 16 +-
framework/source/helper/vclstatusindicator.cxx | 2
framework/source/inc/pattern/configuration.hxx | 6 -
framework/source/interaction/preventduplicateinteraction.cxx | 2
framework/source/jobs/helponstartup.cxx | 28 ++---
framework/source/jobs/jobconst.cxx | 6 -
framework/source/jobs/jobdata.cxx | 8 -
framework/source/jobs/shelljob.cxx | 10 -
framework/source/layoutmanager/layoutmanager.cxx | 6 -
framework/source/loadenv/loadenv.cxx | 26 ++--
framework/source/recording/dispatchrecorder.cxx | 4
framework/source/services/backingcomp.cxx | 16 +-
framework/source/services/backingwindow.cxx | 12 +-
framework/source/services/dispatchhelper.cxx | 2
framework/source/services/frame.cxx | 6 -
framework/source/services/license.cxx | 28 ++---
framework/source/services/modulemanager.cxx | 14 +-
framework/source/services/sessionlistener.cxx | 12 +-
framework/source/services/tabwindowservice.cxx | 4
framework/source/services/urltransformer.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 8 -
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 6 -
framework/source/uiconfiguration/uicategorydescription.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx | 6 -
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 2
framework/source/uielement/complextoolbarcontroller.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/fontmenucontroller.cxx | 2
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/generictoolbarcontroller.cxx | 2
framework/source/uielement/langselectionmenucontroller.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 20 +--
framework/source/uielement/macrosmenucontroller.cxx | 8 -
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 4
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 6 -
framework/source/uielement/toolbarmanager.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 2
framework/source/uielement/uicommanddescription.cxx | 2
framework/source/xml/acceleratorconfigurationwriter.cxx | 8 -
framework/source/xml/toolboxdocumenthandler.cxx | 18 +--
framework/source/xml/xmlnamespaces.cxx | 4
64 files changed, 226 insertions(+), 229 deletions(-)
New commits:
commit 479e3568f3f4d2b27c1d8265caa7d6a5b5ff8215
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Nov 20 14:10:32 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 25
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 91baae0..a66d953 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -64,7 +64,7 @@
#define PATH_SEPERATOR_ASCII "/"
#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/')
-#define PATH_SEPERATOR ::rtl::OUString::createFromAscii(PATH_SEPERATOR_ASCII)
+#define PATH_SEPERATOR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII))
//===============================================
// namespace
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index be13c2e..92bc722 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -673,7 +673,7 @@ void BackingWindow::layoutButton(
const String& i_rStr
)
{
- rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) );
+ rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() );
// setup button
i_rBtn.SetPaintTransparent( TRUE );
i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index a3f86b7..fabf676 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -463,11 +463,11 @@ void ImageManagerImpl::implts_initialize()
try
{
- m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+ m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
nModes );
if ( m_xUserImageStorage.is() )
{
- m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+ m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
nModes );
}
}
@@ -1357,11 +1357,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
{
long nModes = ElementModes::READWRITE;
- uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+ uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
nModes );
if ( xUserImageStorage.is() )
{
- uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+ uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
nModes );
for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
{
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index a1575f3..fddea76 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -452,7 +452,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact
// insert generic categories mappings
m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
- rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories ));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories ));
UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
if ( pCatIter != m_aUICommandsHashMap.end() )
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index c3bd6ca..f139263 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -446,7 +446,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
xURLTransformer->parseStrict( aTargetURL );
aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
- aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+ aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
rtl::OUString aTargetFrame( m_aTargetFrame );
AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId );
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 7f8da62..a2c34f9 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -300,7 +300,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
- aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+ aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
// documents in the picklist will never be opened as templates
aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index 7b012f3..a539224 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -188,15 +188,15 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
}
// pre-calculate a hash code for all style strings to speed up xml read process
- m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode();
- m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode();
- m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode();
- m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode();
- m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
- m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
- m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
- m_nHashCode_Style_Text = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
- m_nHashCode_Style_Image = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
+ m_nHashCode_Style_Radio = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO )).hashCode();
+ m_nHashCode_Style_Auto = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTO )).hashCode();
+ m_nHashCode_Style_Left = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_LEFT )).hashCode();
+ m_nHashCode_Style_AutoSize = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTOSIZE )).hashCode();
+ m_nHashCode_Style_DropDown = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWN )).hashCode();
+ m_nHashCode_Style_Repeat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_REPEAT )).hashCode();
+ m_nHashCode_Style_DropDownOnly = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY )).hashCode();
+ m_nHashCode_Style_Text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT )).hashCode();
+ m_nHashCode_Style_Image = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE )).hashCode();
m_bToolBarStartFound = sal_False;
m_bToolBarEndFound = sal_False;
commit 567a4ce680125d5448ecf98e9bbb0503a0247f1e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Nov 20 12:20:55 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 24
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index af23ef6..45835ee 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -189,13 +189,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -235,7 +235,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
{
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -272,7 +272,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
const ::rtl::OUString& rCommand = lCommandList[i];
if (!rCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -301,7 +301,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
{
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -311,7 +311,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
if (!rCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
static_cast< ::cppu::OWeakObject* >(this));
rCache.removeCommand(sCommand);
@@ -342,7 +342,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
xIn = xStream->getInputStream();
if (!xIn.is())
throw css::io::IOException(
- ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")),
static_cast< ::cppu::OWeakObject* >(this));
// impl_ts_load() does not clear the cache
@@ -381,7 +381,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -408,7 +408,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -635,9 +635,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
//-----------------------------------------------
::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
- static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
- static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" );
- static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" );
+ static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+ static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+ static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
@@ -760,13 +760,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -883,7 +883,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
{
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -947,7 +947,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
const ::rtl::OUString& rCommand = lCommandList[i];
if (!rCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -980,7 +980,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
{
if (!sCommand.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -992,7 +992,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
static_cast< ::cppu::OWeakObject* >(this));
if (rPrimaryCache.hasCommand(sCommand))
@@ -1084,17 +1084,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
return;
long nOpenModes = css::embed::ElementModes::READWRITE;
- css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes);
+ css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes);
if (!xAcceleratorTypeStorage.is())
return;
- css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes);
+ css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes);
css::uno::Reference< css::io::XOutputStream > xOut;
if (xStream.is())
xOut = xStream->getOutputStream();
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
static_cast< ::cppu::OWeakObject* >(this));
// the original m_aCache has been split into primay cache and secondary cache...
@@ -1293,7 +1293,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
}
const ::rtl::OUString sIsoLang = impl_ts_getLocale().toISO();
- const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US");
+ const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US"));
css::uno::Reference< css::container::XNameAccess > xKey;
css::uno::Reference< css::container::XNameAccess > xCommand;
@@ -1342,7 +1342,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
sal_Int32 nIndex = 0;
::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
- ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_");
+ ::rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("KEY_"));
aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
css::uno::Sequence< ::rtl::OUString > sToken(4);
@@ -1577,7 +1577,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
sal_Int32 nIndex = 0;
sKeyIdentifier = sKey.getToken(0, '_', nIndex);
- aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier);
+ aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier);
css::uno::Sequence< ::rtl::OUString > sToken(3);
const sal_Int32 nToken = 3;
@@ -1677,9 +1677,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
//-----------------------------------------------
::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
- static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
- static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" );
- static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" );
+ static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+ static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+ static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 1025ec6..8146616 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -358,7 +358,7 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid)
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
{
Sequence<css::beans::PropertyValue> source;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString::createFromAscii("AcceleratorExecute"));
+ ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute")));
::comphelper::UiEventsLogger::logDispatch(aURL, source);
}
xDispatch->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >());
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index f253d67..0ad751e 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -121,7 +121,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
::comphelper::SequenceAsHashMap lArgs(lArguments);
m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii("DocumentRoot"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")),
css::uno::Reference< css::embed::XStorage >());
aWriteLock.unlock();
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 4fba54a..e0ee119 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -114,12 +114,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
WriteGuard aWriteLock(m_aLock);
::comphelper::SequenceAsHashMap lArgs(lArguments);
- m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
- m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale") , ::rtl::OUString::createFromAscii("x-default"));
+ m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+ m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale")) , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x-default")));
if (!m_sModule.getLength())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")),
static_cast< ::cppu::OWeakObject* >(this));
aWriteLock.unlock();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 407971c..408833e 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -212,7 +212,7 @@ void PresetHandler::forgetCachedStorages()
//-----------------------------------------------
::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
{
- ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error.");
+ ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error."));
switch(nID)
{
@@ -260,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
// Note: May be an user uses URLs without a final slash! Check it ...
nPos = sShareLayer.lastIndexOf('/');
if (nPos != sShareLayer.getLength()-1)
- sShareLayer += ::rtl::OUString::createFromAscii("/");
+ sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
sShareLayer += RELPATH_SHARE_LAYER; // folder
/*
@@ -316,7 +316,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
// Note: May be an user uses URLs without a final slash! Check it ...
sal_Int32 nPos = sUserLayer.lastIndexOf('/');
if (nPos != sUserLayer.getLength()-1)
- sUserLayer += ::rtl::OUString::createFromAscii("/");
+ sUserLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
sUserLayer += RELPATH_USER_LAYER; // storage file
@@ -416,7 +416,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
{
if (!xDocumentRoot.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("There is valid root storage, where the UI configuration can work on."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")),
css::uno::Reference< css::uno::XInterface >());
m_lDocumentStorages.setRootStorage(xDocumentRoot);
xShare = xDocumentRoot;
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index bf015c4..e6b4575 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -50,12 +50,11 @@
#include <vcl/image.hxx>
#include <vcl/msgbox.hxx>
-const ::rtl::OUString SERVICENAME_WINPROVIDER
- = ::rtl::OUString::createFromAscii("com.sun.star.awt.ContainerWindowProvider");
-const ::rtl::OUString EXTERNAL_EVENT = ::rtl::OUString::createFromAscii("external_event");
-const ::rtl::OUString BACK_METHOD = ::rtl::OUString::createFromAscii("back");
-const ::rtl::OUString INITIALIZE_METHOD = ::rtl::OUString::createFromAscii("initialize");
-const ::rtl::OUString OK_METHOD = ::rtl::OUString::createFromAscii("ok");
+const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider"));
+const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event"));
+const ::rtl::OUString BACK_METHOD(RTL_CONSTASCII_USTRINGPARAM("back"));
+const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize"));
+const ::rtl::OUString OK_METHOD(RTL_CONSTASCII_USTRINGPARAM("ok"));
using namespace ::com::sun::star;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 367a3ae..b41f897 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -105,9 +105,9 @@ TaskCreator::~TaskCreator()
css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName ,
sal_Bool bVisible )
{
- static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.Office.TabBrowse");
- static ::rtl::OUString RELPATH = ::rtl::OUString::createFromAscii("TaskCreatorService" );
- static ::rtl::OUString KEY = ::rtl::OUString::createFromAscii("ImplementationName" );
+ static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.TabBrowse"));
+ static ::rtl::OUString RELPATH(RTL_CONSTASCII_USTRINGPARAM("TaskCreatorService"));
+ static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("ImplementationName"));
/* SAFE { */
ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index d51aa64..ed995f9 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -173,7 +173,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
if (!xFrame.is())
return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >();
- CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
+ CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self"))); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY);
css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY);
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index d891271..6688320 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -172,7 +172,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
else
{
aInfo.lURLPattern.realloc(1);
- aInfo.lURLPattern[0] = ::rtl::OUString::createFromAscii("*");
+ aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
}
// SAFE {
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 27ca3b5..e1c65d3 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -383,7 +383,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG )
return 0;
css::util::URL aURL;
- aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin");
+ aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
css::uno::Reference< css::util::XURLTransformer > xTrans ( m_xFactory->createInstance(
SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY );
if( xTrans.is() )
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index e469677..45456d1 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -269,7 +269,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = ::rtl::OUString::createFromAscii("oxt_OpenOffice_Extension");
+ sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension"));
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index c177ed8..f452041 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -65,8 +65,8 @@ namespace css = ::com::sun::star;
//_______________________________________________
// declarations
-const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES = ::rtl::OUString::createFromAscii(".uno:OptionsTreeDialog");
-const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX = ::rtl::OUString::createFromAscii(".uno:About");
+const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog"));
+const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX(RTL_CONSTASCII_USTRINGPARAM(".uno:About"));
//-----------------------------------------------
WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 4e88a53..0e91b80 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -65,7 +65,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
{
m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
m_xServiceManager->createInstance(
- rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.LanguageGuessing")) ),
uno::UNO_QUERY );
}
catch (uno::Exception &r)
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 760891c..492d6b6 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -302,7 +302,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
sal_uInt32 nCount = m_pFrameContainer->getCount();
if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
- throw IndexOutOfBoundsException( OUString::createFromAscii( "OFrames::getByIndex - Index out of bounds" ),
+ throw IndexOutOfBoundsException( OUString(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")),
(OWeakObject *)this );
// Set default return value.
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index f787150..86ff638 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -228,9 +228,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+ ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+ ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
try
{
@@ -258,9 +258,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+ ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+ ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
try
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index cf11be4..64cd2ca 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -74,7 +74,7 @@ namespace framework{
// definitions
sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling
-static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar");
+static ::rtl::OUString PROGRESS_RESOURCE(RTL_CONSTASCII_USTRINGPARAM("private:resource/progressbar/progressbar"));
//-----------------------------------------------
DEFINE_XINTERFACE_5(StatusIndicatorFactory ,
@@ -435,9 +435,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
bool bForceFrontAndFocus(false);
::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
- ::rtl::OUString::createFromAscii("NewDocumentHandling"),
- ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 67e81a6..a97d382 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -235,26 +235,26 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.xforms.XMLFormDocument" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("writer");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("calc");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("impress");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("draw");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("math");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.OfficeDatabaseDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("base");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base"));
else if ( aModuleId.equalsAscii( "com.sun.star.frame.StartModule" ) )
- sDesktopName = ::rtl::OUString::createFromAscii("startcenter");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
else
- sDesktopName = ::rtl::OUString::createFromAscii("startcenter");
+ sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
sApplicationID = aProductName.toAsciiLowerCase();
sApplicationID += ::rtl::OUString(sal_Unicode('-'));
sApplicationID += sDesktopName;
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 1578b3d..26baf43 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -70,7 +70,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
{
if (!m_xParentWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Cant work without a parent window!"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")),
static_cast< css::task::XStatusIndicator* >(this));
}
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx
index 2b61d17..e00967e 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/interaction/preventduplicateinteraction.cxx
@@ -57,7 +57,7 @@ namespace css = ::com::sun::star;
// exported const
//_________________________________________________________________________________________________________________
-#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")
+#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))
//_________________________________________________________________________________________________________________
// exported definitions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 5d4edd9..1c257eb 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -60,26 +60,26 @@ namespace framework{
// definitions
// path to module config
-static ::rtl::OUString CFG_PACKAGE_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static ::rtl::OUString CFG_PACKAGE_SETUP = ::rtl::OUString::createFromAscii("/org.openoffice.Setup" );
-static ::rtl::OUString CFG_PACKAGE_COMMON = ::rtl::OUString::createFromAscii("/org.openoffice.Office.Common" );
-static ::rtl::OUString CFG_PATH_L10N = ::rtl::OUString::createFromAscii("L10N" );
-static ::rtl::OUString CFG_PATH_HELP = ::rtl::OUString::createFromAscii("Help" );
-static ::rtl::OUString CFG_KEY_LOCALE = ::rtl::OUString::createFromAscii("ooLocale" );
-static ::rtl::OUString CFG_KEY_HELPSYSTEM = ::rtl::OUString::createFromAscii("System" );
+static ::rtl::OUString CFG_PACKAGE_MODULES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static ::rtl::OUString CFG_PACKAGE_SETUP (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+static ::rtl::OUString CFG_PACKAGE_COMMON (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common"));
+static ::rtl::OUString CFG_PATH_L10N (RTL_CONSTASCII_USTRINGPARAM("L10N"));
+static ::rtl::OUString CFG_PATH_HELP (RTL_CONSTASCII_USTRINGPARAM("Help"));
+static ::rtl::OUString CFG_KEY_LOCALE (RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
+static ::rtl::OUString CFG_KEY_HELPSYSTEM (RTL_CONSTASCII_USTRINGPARAM("System"));
// props of job environment
-static ::rtl::OUString PROP_ENVIRONMENT = ::rtl::OUString::createFromAscii("Environment" );
-static ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig" );
-static ::rtl::OUString PROP_ENVTYPE = ::rtl::OUString::createFromAscii("EnvType" );
-static ::rtl::OUString PROP_MODEL = ::rtl::OUString::createFromAscii("Model" );
+static ::rtl::OUString PROP_ENVIRONMENT (RTL_CONSTASCII_USTRINGPARAM("Environment"));
+static ::rtl::OUString PROP_JOBCONFIG (RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
+static ::rtl::OUString PROP_ENVTYPE (RTL_CONSTASCII_USTRINGPARAM("EnvType"));
+static ::rtl::OUString PROP_MODEL (RTL_CONSTASCII_USTRINGPARAM("Model"));
// props of module config
-static ::rtl::OUString PROP_HELP_BASEURL = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpBaseURL" );
-static ::rtl::OUString PROP_AUTOMATIC_HELP = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpOnOpen" );
+static ::rtl::OUString PROP_HELP_BASEURL (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL"));
+static ::rtl::OUString PROP_AUTOMATIC_HELP (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen"));
// special value of job environment
-static ::rtl::OUString ENVTYPE_DOCUMENTEVENT = ::rtl::OUString::createFromAscii("DOCUMENTEVENT" );
+static ::rtl::OUString ENVTYPE_DOCUMENTEVENT (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
//-----------------------------------------------
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx
index bd7522e..72127aa 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/jobs/jobconst.cxx
@@ -56,19 +56,19 @@ namespace framework{
const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB()
{
- static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("Deactivate");
+ static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
return PROP;
}
const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS()
{
- static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SaveArguments");
+ static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments"));
return PROP;
}
const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT()
{
- static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SendDispatchResult");
+ static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult"));
return PROP;
}
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 597047b..55cda74 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -422,15 +422,15 @@ JobData::EEnvironment JobData::getEnvironment() const
switch(m_eEnvironment)
{
case E_EXECUTION :
- sDescriptor = ::rtl::OUString::createFromAscii("EXECUTOR");
+ sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR"));
break;
case E_DISPATCH :
- sDescriptor = ::rtl::OUString::createFromAscii("DISPATCH");
+ sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH"));
break;
case E_DOCUMENTEVENT :
- sDescriptor = ::rtl::OUString::createFromAscii("DOCUMENTEVENT");
+ sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
break;
default:
break;
@@ -576,7 +576,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
to "~" ...
*/
- static ::rtl::OUString PATTERN_ISO8601 = ::rtl::OUString::createFromAscii("\?\?\?\?-\?\?-\?\?*\0");
+ static ::rtl::OUString PATTERN_ISO8601(RTL_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0"));
WildCard aISOPattern(PATTERN_ISO8601);
sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index ecded67..09b97e0 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -62,19 +62,19 @@ namespace framework{
// definitions
/** adress job configuration inside argument set provided on method execute(). */
-static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig");
+static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
/** adress job configuration property "Command". */
-static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command");
+static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
/** adress job configuration property "Arguments". */
-static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments");
+static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments"));
/** adress job configuration property "DeactivateJobIfDone". */
-static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone");
+static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone"));
/** adress job configuration property "CheckExitCode". */
-static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode");
+static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode"));
//-----------------------------------------------
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 09ddd0d..837673e 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -333,7 +333,7 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan
xDispatcher->executeDispatch(
xProvider,
aDockWinCommand,
- ::rtl::OUString::createFromAscii("_self"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
0,
aArgs);
}
@@ -6227,8 +6227,8 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
xDispatcher->executeDispatch(
xProvider,
- ::rtl::OUString::createFromAscii(".uno:CloseWin"),
- ::rtl::OUString::createFromAscii("_self"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
0,
css::uno::Sequence< css::beans::PropertyValue >());
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a09936d..f087aba 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -206,13 +206,13 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
{
case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Optional list of arguments seem to be corrupted."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")),
xLoader,
4);
case LoadEnvException::ID_UNSUPPORTED_CONTENT:
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("URL seems to be an unsupported one."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL seems to be an unsupported one.")),
xLoader,
1);
@@ -818,8 +818,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
void LoadEnv::impl_detectTypeAndFilter()
throw(LoadEnvException, css::uno::RuntimeException)
{
- static ::rtl::OUString TYPEPROP_PREFERREDFILTER = ::rtl::OUString::createFromAscii("PreferredFilter");
- static ::rtl::OUString FILTERPROP_FLAGS = ::rtl::OUString::createFromAscii("Flags" );
+ static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"));
+ static ::rtl::OUString FILTERPROP_FLAGS (RTL_CONSTASCII_USTRINGPARAM("Flags"));
static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16;
// SAFE ->
@@ -1003,9 +1003,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
{
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"),
- ::rtl::OUString::createFromAscii("Misc"),
- ::rtl::OUString::createFromAscii("MaxOpenDocuments"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
::comphelper::ConfigurationHelper::E_READONLY);
// NIL means: count of allowed documents = infinite !
@@ -1304,7 +1304,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
// <- SAFE
css::util::URL aCmd;
- aCmd.Complete = ::rtl::OUString::createFromAscii(".uno:JumpToMark");
+ aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark"));
css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW);
xParser->parseStrict(aCmd);
@@ -1314,7 +1314,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
return;
::comphelper::SequenceAsHashMap lArgs;
- lArgs[::rtl::OUString::createFromAscii("Bookmark")] <<= aURL.Mark;
+ lArgs[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"))] <<= aURL.Mark;
xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
}
@@ -1757,9 +1757,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
bool bForceFrontAndFocus(false);
css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
- ::rtl::OUString::createFromAscii("NewDocumentHandling"),
- ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
::comphelper::ConfigurationHelper::E_READONLY);
a >>= bForceFrontAndFocus;
@@ -1802,7 +1802,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
-----------------------------------------------*/
void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
- static ::rtl::OUString PACKAGE_SETUP_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
+ static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
// no window -> action not possible
if (!xWindow.is())
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 5f1c317..1efd8e8 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -132,7 +132,7 @@ DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::lang::XMulti
: ThreadHelpBase ( &Application::GetSolarMutex() )
, ::cppu::OWeakObject( )
, m_xSMGR ( xSMGR )
- , m_xConverter( m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), css::uno::UNO_QUERY )
+ , m_xConverter( m_xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), css::uno::UNO_QUERY )
{
}
@@ -345,7 +345,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL,
::rtl::OUStringBuffer aArgumentBuffer(1000);
::rtl::OUString sArrayName;
// this value is used to name the arrays of aArgumentBuffer
- sArrayName = ::rtl::OUString::createFromAscii("args");
+ sArrayName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("args"));
sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID);
aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index add54b5..9970acf 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -462,17 +462,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
// check some required states
if (m_xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("already attached"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")),
static_cast< ::cppu::OWeakObject* >(this));
if (!xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("invalid frame reference"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")),
static_cast< ::cppu::OWeakObject* >(this));
if (!m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")),
static_cast< ::cppu::OWeakObject* >(this));
// safe the frame reference
@@ -661,7 +661,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("unexpected source or called twice"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")),
static_cast< ::cppu::OWeakObject* >(this));
m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -755,7 +755,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
throw(css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("not supported"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -802,7 +802,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (m_xWindow.is())
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("already initialized"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")),
static_cast< ::cppu::OWeakObject* >(this));
css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -813,7 +813,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
)
{
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("wrong or corrupt argument list"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -824,7 +824,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (!m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("couldn't create component window"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")),
static_cast< ::cppu::OWeakObject* >(this));
// start listening for window disposing
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 6d83baf..be13c2e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -993,8 +993,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs );
}
@@ -1004,8 +1004,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs );
}
@@ -1084,7 +1084,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
aDispatchURL.Complete = i_rURL;
Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
- comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+ comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
com::sun::star::uno::UNO_QUERY );
if ( xURLTransformer.is() )
{
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index fb16978..f372875 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -148,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
sal_Int32 nLength = lArguments.getLength();
aArguments.realloc( nLength + 1 );
- aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode");
+ aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
css::uno::Any aResult;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 03f1f36..a2a5456 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -557,7 +557,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
if (!xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")),
static_cast< css::frame::XFrame* >(this));
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -565,7 +565,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
if ( m_xContainerWindow.is() )
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")),
static_cast< css::frame::XFrame* >(this));
// Look for rejected calls first!
@@ -2614,7 +2614,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
const css::uno::Any& aValue )
{
- static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title");
+ static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"));
/* There is no need to lock any mutex here. Because we share the
solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-)
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 61754bd..a091f93 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -211,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
sal_Int32 nDateLength = 10;
sal_Int32 nTimeLength = 8;
- ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T");
- ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-");
- ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":");
- ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z");
+ ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+ ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+ ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+ ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -276,11 +276,11 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aLangString = aLocale.Language;
if ( aLocale.Country.getLength() != 0 )
{
- aLangString += ::rtl::OUString::createFromAscii("-");
+ aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
aLangString += aLocale.Country;
if ( aLocale.Variant.getLength() != 0 )
{
- aLangString += ::rtl::OUString::createFromAscii("-");
+ aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
aLangString += aLocale.Variant;
}
}
@@ -288,21 +288,21 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
::rtl::OUString aLicensePath =
aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
+ ::rtl::OUString::createFromAscii(szWNTLicenseName)
- + ::rtl::OUString::createFromAscii("_")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
+ aLangString
+ ::rtl::OUString::createFromAscii(szWNTLicenseExt);
#else
::rtl::OUString aLicensePath =
aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
+ ::rtl::OUString::createFromAscii(szUNXLicenseName)
- + ::rtl::OUString::createFromAscii("_")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
+ aLangString
+ ::rtl::OUString::createFromAscii(szUNXLicenseExt);
#endif
// check if we need to show the license at all
// open org.openoffice.Setup/Office/ooLicenseAcceptDate
::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER;
- ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+ ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
::rtl::OUString sReadSrvc = SERVICENAME_CFGREADACCESS;
// get configuration provider
@@ -310,15 +310,15 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
Sequence< Any > theArgs(1);
NamedValue v;
- v.Name = ::rtl::OUString::createFromAscii("NodePath");
- v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office");
+ v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+ v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office"));
theArgs[0] <<= v;
Reference< XPropertySet > pset = Reference< XPropertySet >(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
// if we find a date there, compare it to baseinstall license date
::rtl::OUString aAcceptDate;
- if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate)
+ if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate)
{
// get LicenseFileDate from base install
::rtl::OUString aLicenseURL = aLicensePath;
@@ -356,7 +356,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
// write org.openoffice.Setup/ooLicenseAcceptDate
aAcceptDate = _getCurrentDateString();
- pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+ pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate));
Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
// enable quickstarter
@@ -367,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aSeq[1] <<= bAutostart;
Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY );
if ( xQuickstart.is() )
xQuickstart->initialize( aSeq );
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 8eeb2ac..1f23db3 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -56,8 +56,8 @@
namespace framework
{
-static const ::rtl::OUString CFGPATH_FACTORIES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" );
+static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
/*-----------------------------------------------
04.12.2003 09:32
@@ -146,7 +146,7 @@ ModuleManager::~ModuleManager()
)
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")),
static_cast< ::cppu::OWeakObject* >(this),
1);
}
@@ -176,7 +176,7 @@ ModuleManager::~ModuleManager()
if (sModule.getLength() < 1)
throw css::frame::UnknownModuleException(
- ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")),
static_cast< ::cppu::OWeakObject* >(this));
return sModule;
@@ -196,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (lProps.empty() )
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("No properties given to replace part of module."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")),
static_cast< css::container::XNameAccess* >(this),
2);
}
@@ -223,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
static_cast< css::container::XNameAccess* >(this));
}
@@ -258,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
static_cast< css::container::XNameAccess* >(this));
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index c9c1c67..0d94810 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -164,7 +164,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"));
xURLTransformer->parseStrict(aURL);
// in case of asynchronous call the notification will trigger saveDone()
@@ -172,7 +172,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
xDispatch->addStatusListener(this, aURL);
Sequence< PropertyValue > args(1);
- args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
+ args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -196,11 +196,11 @@ void SessionListener::QuitSessionQuietly()
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionQuietQuit"));
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args(1);
- args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
+ args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -216,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
throw (RuntimeException)
{
- OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient");
+ OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
if (args.getLength() > 0)
{
NamedValue v;
@@ -273,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"));
css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
xURLTransformer->parseStrict(aURL);
Sequence< PropertyValue > args;
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 268c40f..e5ca800 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -441,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
)
{
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
}
}
@@ -455,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
if (pIt == m_lTabPageInfos.end ())
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
return pIt;
}
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 4b80265..74da8f0 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
if ( !bWithPassword && aTestURL.Password.getLength() > 0 )
{
// Exchange password text with other placeholder string
- aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" );
+ aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>"));
assemble( aTestURL );
}
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 8662ac8..4127bb6 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -169,7 +169,7 @@ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "Modul
m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW );
Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance (
- ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
UNO_QUERY );
Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance(
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 9cc183c..3a97816 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -828,8 +828,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
if ( !m_bInitialized )
{
::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+ m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+ m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
{
@@ -1390,7 +1390,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage
Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW);
PropertyValue aProp;
- aProp.Name = ::rtl::OUString::createFromAscii("ModuleIdentifier");
+ aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier"));
aProp.Value <<= aModule;
Sequence< Any > lArgs(1);
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index c942944..62b8956 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1107,7 +1107,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th
Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW);
PropertyValue aProp;
- aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot");
+ aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
aProp.Value <<= xDocumentRoot;
Sequence< Any > lArgs(1);
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 14b0849..a636fcd 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -803,8 +803,8 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments )
if ( !m_bInitialized )
{
::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+ m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+ m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
{
@@ -1386,7 +1386,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (
} // if ( m_bUseDefault )
else
{
- aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot");
+ aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
aProp.Value <<= xDocumentRoot;
}
lArgs[0] <<= aProp;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 3c62aac..643c2e7 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1224,7 +1224,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
sal_Int32 i( 0 );
sal_Int32 nCount( m_aPropArray.size() );
Sequence< PropertyValue > aPropSeq;
- ::rtl::OUString aDelim( ::rtl::OUString::createFromAscii( "," ));
+ ::rtl::OUString aDelim( RTL_CONSTASCII_USTRINGPARAM(",") );
for ( i = 0; i < nCount; i++ )
{
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 499bff1..6832a5d 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -282,7 +282,7 @@ throw (::com::sun::star::uno::RuntimeException)
aArgs[0].Value <<= KeyModifier;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
xDispatch->dispatch( aTargetURL, aArgs );
}
catch ( DisposedException& )
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 6528648..a55a2d6 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -157,7 +157,7 @@ throw ( RuntimeException )
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log(
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log(
m_xServiceManager,
m_xFrame,
aTargetURL,
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index ed2ce7d..8ad9e98 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -344,7 +344,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
Sequence<PropertyValue> aArgs;
Reference< XDispatch > xDispatch = pIter->second;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs);
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs);
if ( xDispatch.is() )
xDispatch->dispatch( aURL, aArgs );
}
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index f47d607..2d97656 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -178,7 +178,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co
{
Sequence<PropertyValue> aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log(
m_xServiceManager,
m_xFrame,
aTargetURL,
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index f9f303f..707ed86 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -316,7 +316,7 @@ void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatc
{
Sequence<PropertyValue> aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch");
if ( _xDispatch.is() )
_xDispatch->dispatch( aTargetURL, aArgs );
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index d5cd4e8..252a51f 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -200,7 +200,7 @@ throw ( RuntimeException )
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
}
}
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 928de91..64a01a6 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -189,7 +189,7 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >&
{
Sequence<PropertyValue> aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
+ UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
xDispatch->dispatch( aTargetURL, aArgs );
}
}
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 2a53808..9357dfd 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -285,55 +285,55 @@ throw (::com::sun::star::uno::RuntimeException)
{
//set selected language as current language for selection
String aSelectedLang = aLangMap[nId];
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_"));
aURL.Complete += aSelectedLang;
}
else if (nId == MID_LANG_SEL_NONE)
{
//set None as current language for selection
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE"));
}
else if (nId == MID_LANG_SEL_RESET)
{
// reset language attributes for selection
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES"));
}
else if (nId == MID_LANG_SEL_MORE)
{
//open the dialog "format/character" for current selection
- aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialog?Language:string=*"));
}
else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
{
//set selected language for current paragraph
String aSelectedLang = aLangMap[nId];
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_"));
aURL.Complete += aSelectedLang;
}
else if (nId == MID_LANG_PARA_NONE)
{
//set None as language for current paragraph
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE"));
}
else if (nId == MID_LANG_PARA_RESET)
{
// reset language attributes for paragraph
- aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES"));
}
else if (nId == MID_LANG_PARA_MORE)
{
//open the dialog "format/character" for current paragraph
- aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph");
+ aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialogForParagraph"));
}
- uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+ uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
xURLTransformer->parseStrict( aURL );
uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
if( xDispatch.is() )
{
uno::Sequence< beans::PropertyValue > aPV;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
+ UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aURL, aPV);
xDispatch->dispatch( aURL, aPV);
}
}
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 20528ae..ff90c49 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -152,7 +152,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
pExecuteInfo->aTargetURL = aTargetURL;
//pExecuteInfo->aArgs = aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
+ UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
// xDispatch->dispatch( aTargetURL, aArgs );
Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
}
@@ -188,10 +188,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt
{
const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
const String ellipsis = String::CreateFromAscii( "..." );
- const ::rtl::OUString providerKey =
- ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" );
- const ::rtl::OUString languageProviderName =
- ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" );
+ const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor"));
+ const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.LanguageScriptProvider"));
USHORT itemId = startItemId;
Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 08f3fe6..4c7f4e6 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list