[Libreoffice-commits] .: 3 commits - framework/source sfx2/qa sfx2/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 19:10:17 PDT 2012
framework/source/accelerators/acceleratorconfiguration.cxx | 56 ++++-----
framework/source/accelerators/documentacceleratorconfiguration.cxx | 2
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 6
framework/source/accelerators/presethandler.cxx | 12 -
framework/source/accelerators/storageholder.cxx | 2
framework/source/classes/taskcreator.cxx | 6
framework/source/dispatch/dispatchinformationprovider.cxx | 2
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/dispatch/oxt_handler.cxx | 4
framework/source/dispatch/windowcommanddispatch.cxx | 4
framework/source/helper/oframes.cxx | 2
framework/source/helper/persistentwindowstate.cxx | 8 -
framework/source/helper/statusindicatorfactory.cxx | 6
framework/source/helper/titlebarupdate.cxx | 14 +-
framework/source/helper/vclstatusindicator.cxx | 2
framework/source/jobs/helponstartup.cxx | 28 ++--
framework/source/jobs/jobdata.cxx | 8 -
framework/source/jobs/shelljob.cxx | 10 -
framework/source/layoutmanager/layoutmanager.cxx | 48 +++----
framework/source/loadenv/loadenv.cxx | 24 +--
framework/source/recording/dispatchrecorder.cxx | 17 +-
framework/source/services/backingcomp.cxx | 16 +-
framework/source/services/backingwindow.cxx | 54 ++++----
framework/source/services/dispatchhelper.cxx | 2
framework/source/services/frame.cxx | 4
framework/source/services/license.cxx | 22 +--
framework/source/services/modulemanager.cxx | 10 -
framework/source/services/sessionlistener.cxx | 12 -
framework/source/services/tabwindowservice.cxx | 6
framework/source/services/urltransformer.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 18 +-
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 26 ++--
framework/source/uiconfiguration/uicategorydescription.cxx | 12 -
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 18 +-
framework/source/uiconfiguration/windowstateconfiguration.cxx | 10 -
framework/source/uielement/buttontoolbarcontroller.cxx | 4
framework/source/uielement/complextoolbarcontroller.cxx | 14 +-
framework/source/uielement/fontmenucontroller.cxx | 6
framework/source/uielement/fontsizemenucontroller.cxx | 6
framework/source/uielement/generictoolbarcontroller.cxx | 8 -
framework/source/uielement/langselectionmenucontroller.cxx | 8 -
framework/source/uielement/macrosmenucontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 24 +--
framework/source/uielement/newmenucontroller.cxx | 6
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 18 +-
framework/source/uielement/toolbarmanager.cxx | 62 +++++-----
framework/source/uielement/toolbarsmenucontroller.cxx | 34 ++---
framework/source/uielement/uicommanddescription.cxx | 32 ++---
framework/source/xml/acceleratorconfigurationwriter.cxx | 8 -
sfx2/qa/cppunit/test_metadatable.cxx | 12 -
sfx2/source/appl/xpackcreator.cxx | 6
sfx2/source/control/unoctitm.cxx | 6
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 12 -
sfx2/source/menu/thessubmenu.cxx | 5
sfx2/source/toolbox/tbxitem.cxx | 29 ++--
sfx2/source/view/viewfrm.cxx | 52 ++++----
sfx2/source/view/viewprn.cxx | 36 ++---
sfx2/source/view/viewsh.cxx | 56 ++++-----
60 files changed, 461 insertions(+), 466 deletions(-)
New commits:
commit 7bf761e85d65c66dc12c49de187ef2952d3f43a4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 21:09:52 2012 -0500
targeted string re-work
Change-Id: I120b321166bb078b44d8b9894a1f906e9c6a611f
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index b7496fe..9d29d01 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -175,7 +175,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
else
{
menuShortCut[1] = (char)( '1' + i );
- aMenuShortCut = rtl::OUString( menuShortCut );
+ aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(menuShortCut) );
}
}
else
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 78ac6cd..87a80a5 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -748,7 +748,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
sal_Int32 nIndex = aCmd.indexOf( '=' );
if (( nIndex > 0 ) && (( nIndex+1 ) < aCmd.getLength() ))
{
- rtl::OUStringBuffer aBuf( rtl::OUString( STATIC_PRIVATE_TB_RESOURCE ));
+ rtl::OUStringBuffer aBuf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_PRIVATE_TB_RESOURCE )));
aBuf.append( aCmd.copy( nIndex+1 ));
sal_Bool bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId ));
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 8a6db03..dcec3ae 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -117,12 +117,12 @@ void MetadatableTest::test()
MockMetadatable m4(*pReg);
MockMetadatable m5(*pReg);
::rtl::OUString empty;
- ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
- ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
- ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
- ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
- ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
- ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
+ ::rtl::OUString content( "content.xml" );
+ ::rtl::OUString styles( "styles.xml" );
+ ::rtl::OUString sid1( "id1" );
+ ::rtl::OUString sid2( "id2" );
+ ::rtl::OUString sid3( "id3" );
+ ::rtl::OUString sid4( "id4" );
beans::StringPair id1(content, sid1);
beans::StringPair id2(content, sid2);
beans::StringPair id3(content, sid3);
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 44c4ed1..07cc225 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -46,15 +46,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.PackageStructureCreator"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.PackageStructureCreator");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
+ return ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator");
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 360590f..aa537a6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -108,7 +108,7 @@ SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBinding
DBG_ASSERT( !pCtrlItem || !pCtrlItem->IsBound(), "ControllerItem is incorrect!" );
aCommand.Complete = rCmd;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
xTrans->parseStrict( aCommand );
pBindings->RegisterUnoController_Impl( this );
}
@@ -464,7 +464,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:"));
aTmp.append(pUnoName);
aDispatchURL.Complete = ::rtl::OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
- Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+ Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
xTrans->parseStrict( aDispatchURL );
}
@@ -688,7 +688,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
// so we must retrieve this as an argument from the parsed URL
lNewArgs.realloc( lNewArgs.getLength()+1 );
nMarkArg = lNewArgs.getLength()-1;
- lNewArgs[nMarkArg].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"));
+ lNewArgs[nMarkArg].Name = ::rtl::OUString("Bookmark");
lNewArgs[nMarkArg].Value <<= aURL.Mark;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 64d28b7..fe4e8be 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -52,7 +52,7 @@
using namespace ::com::sun::star::uno;
using namespace ::rtl;
-#define USERITEM_NAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
+#define USERITEM_NAME OUString("UserItem")
TYPEINIT1(SfxTabDialogItem,SfxSetItem);
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e06df27..3a2a8ec 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2571,12 +2571,12 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
uno::Reference< container::XNameAccess > xNameAccess(
::comphelper::getProcessServiceFactory()->
- createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.UICommandDescription")) ), uno::UNO_QUERY );
+ createInstance( ::rtl::OUString(
+ "com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
uno::Reference< container::XNameAccess > xUICommands;
if ( xNameAccess.is() )
{
- rtl::OUString sTextDoc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
+ rtl::OUString sTextDoc("com.sun.star.text.TextDocument");
if(xNameAccess->hasByName(sTextDoc))
{
uno::Any a = xNameAccess->getByName( sTextDoc );
@@ -2588,18 +2588,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
try
{
uno::Sequence< beans::PropertyValue > aPropSeq;
- uno::Any aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleNewByExample")));
+ uno::Any aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleNewByExample"));
::rtl::OUString sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
- aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleUpdateByExample")));
+ aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleUpdateByExample"));
sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
- aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LoadStyles")));
+ aCommand = xUICommands->getByName(::rtl::OUString(".uno:LoadStyles"));
sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 21d44dc..c5665c7 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -79,8 +79,7 @@ SfxThesSubMenuHelper::SfxThesSubMenuHelper()
{
uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
m_xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW );
+ OUString( "com.sun.star.linguistic2.LinguServiceManager" )), uno::UNO_QUERY_THROW );
m_xThesarus = m_xLngMgr->getThesaurus();
}
catch (const uno::Exception &)
@@ -154,7 +153,7 @@ String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) cons
if (m_xLngMgr.is())
{
uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
+ OUString("com.sun.star.linguistic2.Thesaurus"), rLocale );
// there should be at most one thesaurus configured for each language
DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
if (aServiceNames.getLength() == 1)
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 25ef143..d288eef 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -143,7 +143,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
URL aTargetURL;
aTargetURL.Complete = aCommandURL;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
xTrans->parseStrict( aTargetURL );
if ( !aTargetURL.Arguments.isEmpty() )
return NULL;
@@ -438,7 +438,7 @@ void SfxToolBoxControl::Dispatch(
::com::sun::star::util::URL aTargetURL;
aTargetURL.Complete = rCommand;
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ rtl::OUString("com.sun.star.util.URLTransformer")),
UNO_QUERY );
xTrans->parseStrict( aTargetURL );
@@ -708,7 +708,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))) >>= aSubToolBarResName;
+ xPropSet->getPropertyValue( ::rtl::OUString( "ResourceURL" )) >>= aSubToolBarResName;
}
catch ( com::sun::star::beans::UnknownPropertyException& )
{
@@ -742,7 +742,7 @@ throw (::com::sun::star::uno::RuntimeException)
Reference< ::com::sun::star::beans::XPropertySet > xProp( xUIElement, UNO_QUERY );
if ( xSubToolBar.is() && xProp.is() )
{
- rtl::OUString aPersistentString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+ rtl::OUString aPersistentString( "Persistent" );
try
{
Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
@@ -758,7 +758,7 @@ throw (::com::sun::star::uno::RuntimeException)
xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition );
xLayoutManager->showElement( aSubToolBarResName );
- xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )), a );
+ xProp->setPropertyValue( rtl::OUString( "Persistent" ), a );
}
}
catch ( ::com::sun::star::uno::RuntimeException& )
@@ -803,18 +803,17 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
{
xUIEementFactory = Reference< XUIElementFactory >(
xServiceManager->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.UIElementFactoryManager" ))),
+ rtl::OUString( "com.sun.star.ui.UIElementFactoryManager" )),
UNO_QUERY );
xWeakUIElementFactory = xUIEementFactory;
}
Sequence< PropertyValue > aPropSeq( 3 );
- aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+ aPropSeq[0].Name = rtl::OUString( "Frame" );
aPropSeq[0].Value <<= xFrame;
- aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+ aPropSeq[1].Name = rtl::OUString( "Persistent" );
aPropSeq[1].Value <<= sal_False;
- aPropSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PopupMode" ));
+ aPropSeq[2].Name = rtl::OUString( "PopupMode" );
aPropSeq[2].Value <<= sal_True;
try
@@ -1604,7 +1603,7 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
aTargetURL.Complete = aLastURL;
getURLTransformer()->parseStrict( aTargetURL );
- ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
+ ::rtl::OUString aTarget( ::rtl::OUString("_default"));
if ( pMenu )
{
::framework::MenuConfiguration::Attributes* pMenuAttributes =
@@ -1620,8 +1619,8 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
{
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
- aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )) );
+ aArgs[0].Name = ::rtl::OUString("Referer");
+ aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ) );
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
pExecuteInfo->xDispatch = xDispatch;
@@ -1652,7 +1651,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
URL aTargetURL;
aTargetURL.Complete = aURL;
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ rtl::OUString("com.sun.star.util.URLTransformer")),
UNO_QUERY );
xTrans->parseStrict( aTargetURL );
@@ -1664,7 +1663,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
else
{
- ::rtl::OUString aTargetFrame( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")) );
+ ::rtl::OUString aTargetFrame( ::rtl::OUString("_blank") );
::framework::MenuConfiguration::Attributes* pMenuAttributes =
(::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 155c194..72da247 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -216,7 +216,7 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti
else
{
// the binary format
- bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pFilter->GetServiceName() ) ) == nPasswordHash );
+ bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pFilter->GetServiceName() ) ) == nPasswordHash );
}
}
else
@@ -696,7 +696,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if (!pInteractionItem)
{
- Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
+ Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
if (xHdl.is())
pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
}
@@ -1968,12 +1968,12 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
else
aTransformLoadArgs.remove( "Hidden" );
- ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
+ ::rtl::OUString sURL( "private:object" );
if ( sURL.isEmpty() )
sURL = i_rDoc.GetFactory().GetFactoryURL();
Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
- xLoader->loadComponentFromURL( sURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0,
+ xLoader->loadComponentFromURL( sURL, ::rtl::OUString("_self"), 0,
aTransformLoadArgs.getPropertyValues() );
SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() );
@@ -2342,16 +2342,16 @@ void SfxViewFrame::ExecView_Impl
*/
sal_Bool impl_maxOpenDocCountReached()
{
- static ::rtl::OUString SERVICE_DESKTOP(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"));
+ static ::rtl::OUString SERVICE_DESKTOP("com.sun.star.frame.Desktop");
try
{
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
+ ::rtl::OUString("org.openoffice.Office.Common/"),
+ ::rtl::OUString("Misc"),
+ ::rtl::OUString("MaxOpenDocuments"),
::comphelper::ConfigurationHelper::E_READONLY);
// NIL means: count of allowed documents = infinite !
@@ -2643,7 +2643,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
String aLocation;
Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
Reference< com::sun::star::uri::XUriReferenceFactory > xFactory( xSMgr->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")) ), UNO_QUERY );
+ ::rtl::OUString("com.sun.star.uri.UriReferenceFactory") ), UNO_QUERY );
if ( xFactory.is() )
{
Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY );
@@ -2660,7 +2660,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
aMacroName = aName.getToken( 0, cTok, nIndex );
// get location
- ::rtl::OUString aLocKey(RTL_CONSTASCII_USTRINGPARAM("location"));
+ ::rtl::OUString aLocKey("location");
if ( xUrl->hasParameter( aLocKey ) )
aLocation = xUrl->getParameter( aLocKey );
}
@@ -2814,7 +2814,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
case SID_RECORDMACRO :
{
// try to find any active recorder on this frame
- ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+ ::rtl::OUString sProperty("DispatchRecorderSupplier");
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -2859,11 +2859,11 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
com::sun::star::uno::UNO_QUERY);
xRecorder = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >(
- xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorder"))),
+ xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorder")),
com::sun::star::uno::UNO_QUERY);
xSupplier = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(
- xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorderSupplier"))),
+ xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorderSupplier")),
com::sun::star::uno::UNO_QUERY);
xSupplier->setDispatchRecorder(xRecorder);
@@ -2890,7 +2890,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
{
try
{
- Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+ Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
aValue >>= xLayoutManager;
}
catch ( Exception& )
@@ -2900,7 +2900,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
if ( xLayoutManager.is() )
{
- rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+ rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" );
// Evaluate parameter.
SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False);
sal_Bool bShow( sal_True );
@@ -2944,7 +2944,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
{
try
{
- Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+ Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
aValue >>= xLayoutManager;
}
catch ( Exception& )
@@ -2961,7 +2961,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
try
{
xLMPropSet->setPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HideCurrentUI" )),
+ ::rtl::OUString( "HideCurrentUI" ),
makeAny( bNewFullScreenMode ));
}
catch ( ::com::sun::star::beans::UnknownPropertyException& )
@@ -3020,7 +3020,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break;
}
- ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+ ::rtl::OUString sProperty("DispatchRecorderSupplier");
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -3045,7 +3045,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break;
}
- ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+ ::rtl::OUString sProperty("DispatchRecorderSupplier");
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -3064,13 +3064,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
com::sun::star::uno::Any aProp = xSet->getPropertyValue(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
+ rtl::OUString( "LayoutManager" ) );
if ( !( aProp >>= xLayoutManager ))
rSet.Put( SfxBoolItem( nWhich, sal_False ));
else
{
- rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+ rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" );
sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString );
rSet.Put( SfxBoolItem( nWhich, bShow ));
}
@@ -3149,20 +3149,20 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
else
{
::com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
- Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+ aTargetURL.Complete = ::rtl::OUString(".component:DB/DataSourceBrowser");
+ Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
xTrans->parseStrict( aTargetURL );
Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
Reference < ::com::sun::star::frame::XDispatch > xDisp;
if ( xProv.is() )
- xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), 31 );
+ xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_beamer"), 31 );
if ( xDisp.is() )
{
Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
- pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
+ pArg[0].Name = rtl::OUString("Referer");
+ pArg[0].Value <<= ::rtl::OUString("private:user");
xDisp->dispatch( aTargetURL, aArgs );
}
}
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 405390b..a8c19a2 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -141,10 +141,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_
setValue( rProps[nProp].Name, rProps[nProp].Value );
Sequence< beans::PropertyValue > aRenderOptions( 3 );
- aRenderOptions[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExtraPrintUIOptions" ) );
- aRenderOptions[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) );
+ aRenderOptions[0].Name = rtl::OUString( "ExtraPrintUIOptions" );
+ aRenderOptions[1].Name = rtl::OUString( "View" );
aRenderOptions[1].Value = i_rViewProp;
- aRenderOptions[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) );
+ aRenderOptions[2].Name = rtl::OUString( "IsPrinter" );
aRenderOptions[2].Value <<= sal_True;
try
{
@@ -169,10 +169,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_
}
// set some job parameters
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsApi" ) ), makeAny( i_bApi ) );
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ), makeAny( i_bDirect ) );
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) ), makeAny( sal_True ) );
- setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) ), i_rViewProp );
+ setValue( rtl::OUString( "IsApi" ), makeAny( i_bApi ) );
+ setValue( rtl::OUString( "IsDirect" ), makeAny( i_bDirect ) );
+ setValue( rtl::OUString( "IsPrinter" ), makeAny( sal_True ) );
+ setValue( rtl::OUString( "View" ), i_rViewProp );
}
void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint )
@@ -195,7 +195,7 @@ SfxPrinterController::~SfxPrinterController()
const Any& SfxPrinterController::getSelectionObject() const
{
- const beans::PropertyValue* pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) ) );
+ const beans::PropertyValue* pVal = getValue( rtl::OUString( "PrintSelectionOnly" ) );
if( pVal )
{
sal_Bool bSel = sal_False;
@@ -204,7 +204,7 @@ const Any& SfxPrinterController::getSelectionObject() const
}
sal_Int32 nChoice = 0;
- pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ) );
+ pVal = getValue( rtl::OUString( "PrintContent" ) );
if( pVal )
pVal->Value >>= nChoice;
return (nChoice > 1) ? maSelection : maCompleteSelection;
@@ -222,7 +222,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
}
Sequence< beans::PropertyValue > aRenderOptions( 1 );
- aRenderOptions[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) );
+ aRenderOptions[ 0 ].Name = rtl::OUString( "RenderDevice" );
aRenderOptions[ 0 ].Value <<= mxDevice;
aRenderOptions = getJobProperties( aRenderOptions );
@@ -633,15 +633,15 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
pImp->m_pPrinterController = pController;
SfxObjectShell *pObjShell = GetObjectShell();
- pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ),
+ pController->setValue( rtl::OUString( "JobName" ),
makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
// FIXME: job setup
SfxPrinter* pDocPrt = GetPrinter(sal_False);
JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
if( bIsDirect )
- aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
- String( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+ aJobSetup.SetValue( String( "IsQuickJob" ),
+ String( "true" ) );
Printer::PrintJob( pController, aJobSetup );
}
@@ -718,19 +718,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
{
if ( aProps[nProp].Name == "Copies" )
- aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
+ aProps[nProp]. Name = rtl::OUString("CopyCount");
else if ( aProps[nProp].Name == "RangeText" )
- aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
+ aProps[nProp]. Name = rtl::OUString("Pages");
if ( aProps[nProp].Name == "Asynchron" )
{
- aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
+ aProps[nProp]. Name = rtl::OUString("Wait");
sal_Bool bAsynchron = sal_False;
aProps[nProp].Value >>= bAsynchron;
aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
}
if ( aProps[nProp].Name == "Silent" )
{
- aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
+ aProps[nProp]. Name = rtl::OUString("MonitorVisible");
sal_Bool bPrintSilent = sal_False;
aProps[nProp].Value >>= bPrintSilent;
aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
@@ -746,7 +746,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
{
sal_Int32 nLen = aProps.getLength();
aProps.realloc( nLen + 1 );
- aProps[nLen].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) );
+ aProps[nLen].Name = rtl::OUString( "PrintSelectionOnly" );
aProps[nLen].Value = makeAny( bSelection );
}
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6b6b067..31f421f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -245,7 +245,7 @@ static ::rtl::OUString RetrieveLabelFromCommand(
{
xModuleManager = css::uno::Reference< css::frame::XModuleManager >(
xSMGR->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
+ ::rtl::OUString( "com.sun.star.frame.ModuleManager" )),
css::uno::UNO_QUERY_THROW );
s_xModuleManager = xModuleManager;
}
@@ -256,7 +256,7 @@ static ::rtl::OUString RetrieveLabelFromCommand(
{
xNameAccess = css::uno::Reference< css::container::XNameAccess >(
xSMGR->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ))),
+ ::rtl::OUString( "com.sun.star.frame.UICommandDescription" )),
css::uno::UNO_QUERY_THROW );
s_xNameAccess = xNameAccess;
}
@@ -326,9 +326,9 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
{
// Retrieve filter from type
css::uno::Sequence< css::beans::NamedValue > aQuery( 2 );
- aQuery[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
+ aQuery[0].Name = rtl::OUString( "Type" );
aQuery[0].Value = css::uno::makeAny( rType );
- aQuery[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ));
+ aQuery[1].Name = rtl::OUString( "DocumentService" );
aQuery[1].Value = css::uno::makeAny( rModuleIdentifier );
css::uno::Reference< css::container::XEnumeration > xEnumeration =
@@ -339,11 +339,11 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
{
::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
+ ::rtl::OUString("Name"),
::rtl::OUString() );
sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
+ ::rtl::OUString("Flags"),
sal_Int32( 0 ) );
if ( nFilterFlags & nFlags )
@@ -369,7 +369,7 @@ enum ETypeFamily
::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame ,
ETypeFamily eTypeFamily)
{
- static ::rtl::OUString SERVICENAME_MODULEMANAGER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
+ static ::rtl::OUString SERVICENAME_MODULEMANAGER("com.sun.star.frame.ModuleManager");
try
{
@@ -384,32 +384,32 @@ enum ETypeFamily
case E_MS_DOC:
{
if ( sModule == "com.sun.star.text.TextDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_MS_Word_97" ));
+ sType = ::rtl::OUString( "writer_MS_Word_97" );
else
if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_MS_Excel_97" ));
+ sType = ::rtl::OUString( "calc_MS_Excel_97" );
else
if ( sModule == "com.sun.star.drawing.DrawingDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_MS_PowerPoint_97" ));
+ sType = ::rtl::OUString( "impress_MS_PowerPoint_97" );
else
if ( sModule == "com.sun.star.presentation.PresentationDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_MS_PowerPoint_97" ));
+ sType = ::rtl::OUString( "impress_MS_PowerPoint_97" );
}
break;
case E_OOO_DOC:
{
if ( sModule == "com.sun.star.text.TextDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer8" ));
+ sType = ::rtl::OUString( "writer8" );
else
if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc8" ));
+ sType = ::rtl::OUString( "calc8" );
else
if ( sModule == "com.sun.star.drawing.DrawingDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw8" ));
+ sType = ::rtl::OUString( "draw8" );
else
if ( sModule == "com.sun.star.presentation.PresentationDocument" )
- sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress8" ));
+ sType = ::rtl::OUString( "impress8" );
}
break;
}
@@ -481,20 +481,20 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
{
try
{
- Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+ Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
aValue >>= xLayoutManager;
if ( xLayoutManager.is() )
{
- rtl::OUString aTextResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/textobjectbar" ));
+ rtl::OUString aTextResString( "private:resource/toolbar/textobjectbar" );
uno::Reference< ui::XUIElement > xElement = xLayoutManager->getElement( aTextResString );
if(!xElement.is())
{
- rtl::OUString aFrameResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/frameobjectbar" ));
+ rtl::OUString aFrameResString( "private:resource/toolbar/frameobjectbar" );
xElement = xLayoutManager->getElement( aFrameResString );
}
if(!xElement.is())
{
- rtl::OUString aOleResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/oleobjectbar" ));
+ rtl::OUString aOleResString( "private:resource/toolbar/oleobjectbar" );
xElement = xLayoutManager->getElement( aOleResString );
}
if(xElement.is())
@@ -575,7 +575,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
else
if ( nId == SID_MAIL_SENDDOCASPDF )
- eResult = aModel.SaveAndSend( xFrame, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf_Portable_Document_Format" )));
+ eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" ));
else
if ( nId == SID_MAIL_SENDDOCASMS )
{
@@ -615,7 +615,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
css::uno::Reference < css::frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() );
css::uno::Reference< css::frame::XModel > xModel;
- const rtl::OUString aModuleManager( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ));
+ const rtl::OUString aModuleManager( "com.sun.star.frame.ModuleManager" );
css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance( aModuleManager ), css::uno::UNO_QUERY_THROW );
if ( !xModuleManager.is() )
{
@@ -648,9 +648,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
if ( xModel.is() && xStorable.is() )
{
rtl::OUString aFilterName;
- rtl::OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM( HTML_DOCUMENT_TYPE ));
+ rtl::OUString aTypeName( HTML_DOCUMENT_TYPE );
rtl::OUString aFileName;
- rtl::OUString aExtension( RTL_CONSTASCII_USTRINGPARAM( "htm" ));
+ rtl::OUString aExtension( "htm" );
rtl::OUString aLocation = xStorable->getLocation();
INetURLObject aFileObj( aLocation );
@@ -660,7 +660,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
css::uno::Reference< css::container::XContainerQuery > xContainerQuery(
xSMGR->createInstance( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ))),
+ "com.sun.star.document.FilterFactory" )),
css::uno::UNO_QUERY_THROW );
// Retrieve filter from type
@@ -670,7 +670,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
{
// Draw/Impress uses a different type. 2nd chance try to use alternative type name
aFilterName = impl_retrieveFilterNameFromTypeAndModule(
- xContainerQuery, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( HTML_GRAPHIC_TYPE )), aModule, nFilterFlags );
+ xContainerQuery, ::rtl::OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags );
}
// No filter found => error
@@ -685,7 +685,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
if ( !bHasLocation )
{
// Create a default file name with the correct extension
- const rtl::OUString aPreviewFileName( RTL_CONSTASCII_USTRINGPARAM( "webpreview" ));
+ const rtl::OUString aPreviewFileName( "webpreview" );
aFileName = aPreviewFileName;
}
else
@@ -708,7 +708,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE );
css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[0].Name = rtl::OUString( "FilterName" );
aArgs[0].Value = css::uno::makeAny( aFilterName );
// Store document in the html format
@@ -841,7 +841,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
::rtl::OUStringBuffer aBuffer( 60 );
aBuffer.append( RetrieveLabelFromCommand(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintDefault" )),
+ ::rtl::OUString( ".uno:PrintDefault" ),
xFrame ));
aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
aBuffer.append( aPrinterName );
commit bc62d262fa73546d324b47348447ca135a4483b5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 20:48:30 2012 -0500
targeted string re-work
Change-Id: I2cded25cc1d63a02a14633e2de4c6f37662feb25
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 4f6b140..d442274 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -62,7 +62,7 @@
#define PATH_SEPERATOR_ASCII "/"
#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/')
-#define PATH_SEPERATOR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII))
+#define PATH_SEPERATOR ::rtl::OUString(PATH_SEPERATOR_ASCII)
//===============================================
// namespace
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 0abb42b..7931cbf 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -189,7 +189,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
if ( !m_bVectorInit )
{
- const rtl::OUString aCommandImageList( RTL_CONSTASCII_USTRINGPARAM( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ));
+ const rtl::OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST );
Sequence< OUString > aCmdImageSeq;
uno::Reference< XNameAccess > xCmdDesc( m_xServiceManager->createInstance(
SERVICENAME_UICOMMANDDESCRIPTION ),
@@ -237,7 +237,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
// Create a image name vector that must be provided to the vcl imagelist. We also need
// a command to image name map to speed up access time for image retrieval.
- OUString aUNOString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
+ OUString aUNOString( ".uno:" );
String aEmptyString;
const sal_uInt32 nCount = m_aImageCommandNameVector.size();
for ( sal_uInt32 i = 0; i < nCount; i++ )
@@ -458,11 +458,11 @@ void ImageManagerImpl::implts_initialize()
try
{
- m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
+ m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(IMAGE_FOLDER ),
nModes );
if ( m_xUserImageStorage.is() )
{
- m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
+ m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(BITMAPS_FOLDER ),
nModes );
}
}
@@ -692,8 +692,8 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory >
ThreadHelpBase( &Application::GetSolarMutex() )
, m_xServiceManager( xServiceManager )
, m_pDefaultImageList( 0 )
- , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
- , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))
+ , m_aXMLPostfix( ".xml" )
+ , m_aResourceString( ModuleImageList )
, m_aListenerContainer( m_aLock.getShareableOslMutex() )
, m_bUseGlobal(_bUseGlobal)
, m_bReadOnly( true )
@@ -791,7 +791,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
if ( xPropSet.is() )
{
long nOpenMode = 0;
- if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode )
+ if ( xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )) >>= nOpenMode )
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
}
}
@@ -1352,11 +1352,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
{
long nModes = ElementModes::READWRITE;
- uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
+ uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(IMAGE_FOLDER ),
nModes );
if ( xUserImageStorage.is() )
{
- uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
+ uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(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 414a4da..8b95946 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -156,8 +156,8 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali
ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XMultiServiceFactory >& rServiceManager ) :
ThreadHelpBase(),
- m_aConfigCategoryAccess( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_ROOT_ACCESS )),
- m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_PROPERTY_NAME )),
+ m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ),
+ m_aPropUIName( CONFIGURATION_PROPERTY_NAME ),
m_xGenericUICategories( rGenericUICategories ),
m_xServiceManager( rServiceManager ),
m_bConfigAccessInitialized( sal_False ),
@@ -166,7 +166,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" );
// Create configuration hierachical access name
m_aConfigCategoryAccess += aModuleName;
- m_aConfigCategoryAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ));
+ m_aConfigCategoryAccess += rtl::OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS );
m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
}
@@ -374,7 +374,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
try
{
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+ aPropValue.Name = rtl::OUString( "nodepath" );
aPropValue.Value <<= m_aConfigCategoryAccess;
aArgs[0] <<= aPropValue;
@@ -447,12 +447,12 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact
UICommandDescription(xServiceManager,true)
{
Reference< XNameAccess > xEmpty;
- rtl::OUString aGenericCategories( RTL_CONSTASCII_USTRINGPARAM( "GenericCategories" ));
+ rtl::OUString aGenericCategories( "GenericCategories" );
m_xGenericUICommands = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, xServiceManager );
// insert generic categories mappings
m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories ));
+ rtl::OUString(GENERIC_MODULE_NAME ), aGenericCategories ));
UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
if ( pCatIter != m_aUICommandsHashMap.end() )
commit eeac11421792819a42eb442ac4b64fa963901662
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 20:41:34 2012 -0500
targeted string re-work
Change-Id: I3276836b76b69f04de38c2d36ae04b60c49d4873
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3fd5c72..19a7a0e 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -178,13 +178,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
+ ::rtl::OUString("Such key event seams not to be supported by any operating system."),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -224,7 +224,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -261,7 +261,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
const ::rtl::OUString& rCommand = lCommandList[i];
if (rCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -290,7 +290,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -300,7 +300,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
if (!rCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
+ ::rtl::OUString("Command does not exists inside this container."),
static_cast< ::cppu::OWeakObject* >(this));
rCache.removeCommand(sCommand);
@@ -331,7 +331,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
xIn = xStream->getInputStream();
if (!xIn.is())
throw css::io::IOException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")),
+ ::rtl::OUString("Could not open accelerator configuration for reading."),
static_cast< ::cppu::OWeakObject* >(this));
// impl_ts_load() does not clear the cache
@@ -370,7 +370,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
+ ::rtl::OUString("Could not open accelerator configuration for saving."),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -397,7 +397,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
+ ::rtl::OUString("Could not open accelerator configuration for saving."),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -624,9 +624,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
//-----------------------------------------------
::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
- 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"));
+ static ::rtl::OUString LOCALE_PACKAGE("/org.openoffice.Setup");
+ static ::rtl::OUString LOCALE_PATH("L10N");
+ static ::rtl::OUString LOCALE_KEY("ooLocale");
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
@@ -678,7 +678,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
, m_pPrimaryWriteCache(0 )
, m_pSecondaryWriteCache(0 )
{
- const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators"));
+ const ::rtl::OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
css::uno::UNO_QUERY );
@@ -749,13 +749,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
+ ::rtl::OUString("Such key event seams not to be supported by any operating system."),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -872,7 +872,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -936,7 +936,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
const ::rtl::OUString& rCommand = lCommandList[i];
if (rCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -969,7 +969,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
+ ::rtl::OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -981,7 +981,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
+ ::rtl::OUString("Command does not exists inside this container."),
static_cast< ::cppu::OWeakObject* >(this));
if (rPrimaryCache.hasCommand(sCommand))
@@ -1073,17 +1073,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(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes);
+ css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString("accelerator"), nOpenModes);
if (!xAcceleratorTypeStorage.is())
return;
- css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes);
+ css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString("current"), nOpenModes);
css::uno::Reference< css::io::XOutputStream > xOut;
if (xStream.is())
xOut = xStream->getOutputStream();
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
+ ::rtl::OUString("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...
@@ -1282,7 +1282,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
}
const ::rtl::OUString sIsoLang = impl_ts_getLocale().toISO();
- const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ const ::rtl::OUString sDefaultLocale("en-US");
css::uno::Reference< css::container::XNameAccess > xKey;
css::uno::Reference< css::container::XNameAccess > xCommand;
@@ -1331,7 +1331,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_CONSTASCII_USTRINGPARAM("KEY_"));
+ ::rtl::OUString sPrefix("KEY_");
aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
css::uno::Sequence< ::rtl::OUString > sToken(4);
@@ -1566,7 +1566,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
sal_Int32 nIndex = 0;
sKeyIdentifier = sKey.getToken(0, '_', nIndex);
- aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier);
+ aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString("KEY_")+sKeyIdentifier);
css::uno::Sequence< ::rtl::OUString > sToken(3);
const sal_Int32 nToken = 3;
@@ -1666,9 +1666,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
//-----------------------------------------------
::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
- 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"));
+ static ::rtl::OUString LOCALE_PACKAGE("/org.openoffice.Setup");
+ static ::rtl::OUString LOCALE_PATH("L10N");
+ static ::rtl::OUString LOCALE_KEY("ooLocale");
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index c1434d4..6b13a72 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -119,7 +119,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
::comphelper::SequenceAsHashMap lArgs(lArguments);
m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")),
+ ::rtl::OUString("DocumentRoot"),
css::uno::Reference< css::embed::XStorage >());
aWriteLock.unlock();
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index dcdb2a4..b5117ea 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -112,12 +112,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
WriteGuard aWriteLock(m_aLock);
::comphelper::SequenceAsHashMap lArgs(lArguments);
- 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")));
+ m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString());
+ m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString("Locale") , ::rtl::OUString("x-default"));
if (m_sModule.isEmpty())
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")),
+ ::rtl::OUString("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 b68fdc4..dd202af 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -211,7 +211,7 @@ namespace {
::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
{
- ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error."));
+ ::rtl::OUString sMessage("Unknown error.");
switch(nID)
{
@@ -242,8 +242,8 @@ void lcl_throwCorruptedUIConfigurationException(
lcl_getLocalizedMessage(id),
css::uno::Reference< css::uno::XInterface >(),
(exception.getValueTypeName() +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": \"")) + e.Message +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))));
+ rtl::OUString(": \"") + e.Message +
+ rtl::OUString("\"")));
}
}
@@ -275,7 +275,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(RTL_CONSTASCII_USTRINGPARAM("/"));
+ sShareLayer += ::rtl::OUString("/");
sShareLayer += RELPATH_SHARE_LAYER; // folder
/*
@@ -330,7 +330,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(RTL_CONSTASCII_USTRINGPARAM("/"));
+ sUserLayer += ::rtl::OUString("/");
sUserLayer += RELPATH_USER_LAYER; // storage file
@@ -429,7 +429,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
{
if (!xDocumentRoot.is())
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")),
+ ::rtl::OUString("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/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 05aa9b4..52bc730 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -103,9 +103,9 @@ TaskCreator::~TaskCreator()
css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName ,
sal_Bool bVisible )
{
- 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"));
+ static ::rtl::OUString PACKAGE("org.openoffice.Office.TabBrowse");
+ static ::rtl::OUString RELPATH("TaskCreatorService");
+ static ::rtl::OUString KEY("ImplementationName");
/* SAFE { */
ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 7352b21..91c003d 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -171,7 +171,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(RTL_CONSTASCII_USTRINGPARAM("_self"))); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
+ CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString("_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 61523cf..4cb3987 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -152,7 +152,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
else
{
aInfo.lURLPattern.realloc(1);
- aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
+ aInfo.lURLPattern[0] = ::rtl::OUString("*");
}
// SAFE {
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index de53607..ad3e493 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -74,7 +74,7 @@ namespace framework{
// non exported definitions
//_________________________________________________________________________________________________________________
-#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+#define UNISTRING(s) rtl::OUString(s)
//_________________________________________________________________________________________________________________
// declarations
@@ -256,7 +256,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(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension"));
+ sTypeName = ::rtl::OUString("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 022537c..756a166 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -151,11 +151,11 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
switch (nCommand)
{
case SHOWDIALOG_ID_PREFERENCES :
- sCommand = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog"));
+ sCommand = rtl::OUString(".uno:OptionsTreeDialog");
break;
case SHOWDIALOG_ID_ABOUT :
- sCommand = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:About"));
+ sCommand = rtl::OUString(".uno:About");
break;
default :
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 8f51842..9633801 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -300,7 +300,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(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")),
+ throw IndexOutOfBoundsException( OUString("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 e7ea065..74652f6 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -227,9 +227,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
+ ::rtl::OUString sPackage("org.openoffice.Setup/");
::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
+ ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
try
{
@@ -257,9 +257,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
+ ::rtl::OUString sPackage("org.openoffice.Setup/");
::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
+ ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
try
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 4c1e414..7e0a988 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -433,9 +433,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
bool bForceFrontAndFocus(false);
::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
+ ::rtl::OUString("org.openoffice.Office.Common/View"),
+ ::rtl::OUString("NewDocumentHandling"),
+ ::rtl::OUString("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 c14fd58..d8f2bd3 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -206,24 +206,24 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
+ sDesktopName = ::rtl::OUString("writer");
else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
+ sDesktopName = ::rtl::OUString("calc");
else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
+ sDesktopName = ::rtl::OUString("impress");
else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
+ sDesktopName = ::rtl::OUString("draw");
else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
+ sDesktopName = ::rtl::OUString("math");
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) )
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base"));
+ sDesktopName = ::rtl::OUString("base");
else
- sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
+ sDesktopName = ::rtl::OUString("startcenter");
sApplicationID = utl::ConfigManager::getProductName().
toAsciiLowerCase();
sApplicationID += ::rtl::OUString(sal_Unicode('-'));
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index a39f405..277e60f 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -68,7 +68,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
{
if (!m_xParentWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")),
+ ::rtl::OUString("Cant work without a parent window!"),
static_cast< css::task::XStatusIndicator* >(this));
}
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index b1d0dab..d0bc8b2 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -58,26 +58,26 @@ namespace framework{
// definitions
// path to module config
-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"));
+static ::rtl::OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories");
+static ::rtl::OUString CFG_PACKAGE_SETUP ("/org.openoffice.Setup");
+static ::rtl::OUString CFG_PACKAGE_COMMON ("/org.openoffice.Office.Common");
+static ::rtl::OUString CFG_PATH_L10N ("L10N");
+static ::rtl::OUString CFG_PATH_HELP ("Help");
+static ::rtl::OUString CFG_KEY_LOCALE ("ooLocale");
+static ::rtl::OUString CFG_KEY_HELPSYSTEM ("System");
// props of job environment
-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"));
+static ::rtl::OUString PROP_ENVIRONMENT ("Environment");
+static ::rtl::OUString PROP_JOBCONFIG ("JobConfig");
+static ::rtl::OUString PROP_ENVTYPE ("EnvType");
+static ::rtl::OUString PROP_MODEL ("Model");
// props of module config
-static ::rtl::OUString PROP_HELP_BASEURL (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL"));
-static ::rtl::OUString PROP_AUTOMATIC_HELP (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen"));
+static ::rtl::OUString PROP_HELP_BASEURL ("ooSetupFactoryHelpBaseURL");
+static ::rtl::OUString PROP_AUTOMATIC_HELP ("ooSetupFactoryHelpOnOpen");
// special value of job environment
-static ::rtl::OUString ENVTYPE_DOCUMENTEVENT (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
+static ::rtl::OUString ENVTYPE_DOCUMENTEVENT ("DOCUMENTEVENT");
//-----------------------------------------------
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index bf1925a..c1cbcf8 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -425,15 +425,15 @@ JobData::EEnvironment JobData::getEnvironment() const
switch(m_eEnvironment)
{
case E_EXECUTION :
- sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR"));
+ sDescriptor = ::rtl::OUString("EXECUTOR");
break;
case E_DISPATCH :
- sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH"));
+ sDescriptor = ::rtl::OUString("DISPATCH");
break;
case E_DOCUMENTEVENT :
- sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
+ sDescriptor = ::rtl::OUString("DOCUMENTEVENT");
break;
default:
break;
@@ -583,7 +583,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_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0"));
+ static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*\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 b862893..9bf8571 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -58,19 +58,19 @@ namespace framework{
// definitions
/** address job configuration inside argument set provided on method execute(). */
-static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
+static const ::rtl::OUString PROP_JOBCONFIG("JobConfig");
/** address job configuration property "Command". */
-static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
+static const ::rtl::OUString PROP_COMMAND("Command");
/** address job configuration property "Arguments". */
-static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments"));
+static const ::rtl::OUString PROP_ARGUMENTS("Arguments");
/** address job configuration property "DeactivateJobIfDone". */
-static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone"));
+static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone");
/** address job configuration property "CheckExitCode". */
-static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode"));
+static const ::rtl::OUString PROP_CHECKEXITCODE("CheckExitCode");
//-----------------------------------------------
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index f0447a4..e44e231 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -144,24 +144,24 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
, m_xPersistentWindowStateSupplier( Reference< XNameAccess >(
xServiceManager->createInstance( SERVICENAME_WINDOWSTATECONFIGURATION ), UNO_QUERY ))
, m_pGlobalSettings( 0 )
- , m_aStatusBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ))
- , m_aProgressBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar" ))
- , m_aPropDocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKED ))
- , m_aPropVisible( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_VISIBLE ))
- , m_aPropDockingArea( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKINGAREA ))
- , m_aPropDockPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKPOS ))
- , m_aPropPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_POS ))
- , m_aPropSize( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_SIZE ))
- , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_UINAME ))
- , m_aPropStyle( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_STYLE ))
- , m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_LOCKED ))
- , m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" ))
+ , m_aStatusBarAlias( "private:resource/statusbar/statusbar" )
+ , m_aProgressBarAlias( "private:resource/progressbar/progressbar" )
+ , m_aPropDocked( WINDOWSTATE_PROPERTY_DOCKED )
+ , m_aPropVisible( WINDOWSTATE_PROPERTY_VISIBLE )
+ , m_aPropDockingArea( WINDOWSTATE_PROPERTY_DOCKINGAREA )
+ , m_aPropDockPos( WINDOWSTATE_PROPERTY_DOCKPOS )
+ , m_aPropPos( WINDOWSTATE_PROPERTY_POS )
+ , m_aPropSize( WINDOWSTATE_PROPERTY_SIZE )
+ , m_aPropUIName( WINDOWSTATE_PROPERTY_UINAME )
+ , m_aPropStyle( WINDOWSTATE_PROPERTY_STYLE )
+ , m_aPropLocked( WINDOWSTATE_PROPERTY_LOCKED )
+ , m_aCustomizeCmd( "ConfigureDialog" )
, m_aListenerContainer( m_aLock.getShareableOslMutex() )
, m_pToolbarManager( 0 )
{
// Initialize statusbar member
const sal_Bool bRefreshVisibility = sal_False;
- m_aStatusBarElement.m_aType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "statusbar" ));
+ m_aStatusBarElement.m_aType = rtl::OUString( "statusbar" );
m_aStatusBarElement.m_aName = m_aStatusBarAlias;
m_pToolbarManager = new ToolbarLayoutManager( xServiceManager, m_xUIElementFactoryManager, this );
@@ -212,7 +212,7 @@ void LayoutManager::impl_clearUpMenuBar()
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
+ xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar;
}
catch (const beans::UnknownPropertyException&)
{
@@ -652,7 +652,7 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
try
{
// Check persistent flag of the user interface element
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ))) >>= bPersistent;
+ xPropSet->getPropertyValue( ::rtl::OUString( "Persistent" )) >>= bPersistent;
}
catch (const beans::UnknownPropertyException&)
{
@@ -733,9 +733,9 @@ Reference< XUIElement > LayoutManager::implts_createElement( const rtl::OUString
ReadGuard aReadLock( m_aLock );
Sequence< PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+ aPropSeq[0].Name = ::rtl::OUString( "Frame" );
aPropSeq[0].Value <<= m_xFrame;
- aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+ aPropSeq[1].Name = ::rtl::OUString( "Persistent" );
aPropSeq[1].Value <<= sal_True;
try
@@ -1514,7 +1514,7 @@ throw (RuntimeException)
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
+ xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar;
}
catch (const beans::UnknownPropertyException&)
{
@@ -2492,7 +2492,7 @@ sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContaine
{
sal_Int32 nDisplay = xContainerTopWindow->getDisplay();
Reference< beans::XPropertySet > xDisplayInfo( xDisplayAccess->getByIndex( nDisplay ), UNO_QUERY_THROW );
- OSL_VERIFY( xDisplayInfo->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WorkArea" ) ) ) >>= aWorkArea );
+ OSL_VERIFY( xDisplayInfo->getPropertyValue( ::rtl::OUString( "WorkArea" ) ) >>= aWorkArea );
}
catch( const Exception& )
{
@@ -2676,8 +2676,8 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
xDispatcher->executeDispatch(
xProvider,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
+ ::rtl::OUString(".uno:CloseWin"),
+ ::rtl::OUString("_self"),
0,
uno::Sequence< beans::PropertyValue >());
@@ -3024,7 +3024,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
if ( xElementSettings.is() )
{
- ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+ ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
uno::Reference< XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
if ( xPropSet.is() )
{
@@ -3074,7 +3074,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
if ( xElementSettings.is() )
{
bool bNoSettings( false );
- ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+ ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
Reference< XInterface > xElementCfgMgr;
Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
@@ -3157,7 +3157,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
if ( xElementSettings.is() )
{
- ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+ ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
Reference< XInterface > xElementCfgMgr;
Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index ea4b4bb..cc24ece 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -192,7 +192,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
{
case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")),
+ ::rtl::OUString("Optional list of arguments seem to be corrupted."),
xLoader,
4);
@@ -782,8 +782,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
void LoadEnv::impl_detectTypeAndFilter()
throw(LoadEnvException, css::uno::RuntimeException)
{
- static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"));
- static ::rtl::OUString FILTERPROP_FLAGS (RTL_CONSTASCII_USTRINGPARAM("Flags"));
+ static ::rtl::OUString TYPEPROP_PREFERREDFILTER("PreferredFilter");
+ static ::rtl::OUString FILTERPROP_FLAGS ("Flags");
static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16;
// SAFE ->
@@ -966,9 +966,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
{
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
+ ::rtl::OUString("org.openoffice.Office.Common/"),
+ ::rtl::OUString("Misc"),
+ ::rtl::OUString("MaxOpenDocuments"),
::comphelper::ConfigurationHelper::E_READONLY);
// NIL means: count of allowed documents = infinite !
@@ -1258,7 +1258,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
// <- SAFE
css::util::URL aCmd;
- aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark"));
+ aCmd.Complete = ::rtl::OUString(".uno:JumpToMark");
css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW);
xParser->parseStrict(aCmd);
@@ -1268,7 +1268,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
return;
::comphelper::SequenceAsHashMap lArgs;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list