summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2013-02-23 19:28:39 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-02-25 18:31:40 +0000
commitf5305a942bf4c685474c8cd7d5aa6301f5abf75c (patch)
tree1bd0ff1cdd4a59859fa6080bc1636000e5e33931 /cui
parent5e5b7e431edc837b2be32d03fcbb1e32377e935a (diff)
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Conflicts: cui/source/options/optgdlg.cxx cui/source/options/webconninfo.cxx dbaccess/source/ui/app/AppController.cxx Change-Id: I2abfad91318e8be8c0f77909cbd76825cdca9b85 Reviewed-on: https://gerrit.libreoffice.org/2350 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/acccfg.cxx36
-rw-r--r--cui/source/customize/cfgutil.cxx98
-rw-r--r--cui/source/customize/macropg.cxx58
-rw-r--r--cui/source/customize/selector.cxx18
-rw-r--r--cui/source/dialogs/hyphen.cxx6
-rw-r--r--cui/source/options/connpoolconfig.cxx36
-rw-r--r--cui/source/options/optgdlg.cxx66
-rw-r--r--cui/source/options/optinet2.cxx64
-rw-r--r--cui/source/options/optlingu.cxx18
-rw-r--r--cui/source/options/optpath.cxx34
-rw-r--r--cui/source/options/webconninfo.cxx10
-rw-r--r--cui/source/tabpages/autocdlg.cxx44
12 files changed, 243 insertions, 245 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 78463c94cb51..fb313b74a0f0 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -77,16 +77,16 @@ using namespace com::sun::star;
//-----------------------------------------------
-static ::rtl::OUString SERVICE_UICONFIGMGR (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager" ));
+static OUString SERVICE_UICONFIGMGR ("com.sun.star.ui.UIConfigurationManager" );
-static ::rtl::OUString MODULEPROP_SHORTNAME (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName" ));
-static ::rtl::OUString MODULEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryUIName" ));
-static ::rtl::OUString CMDPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("Name" ));
+static OUString MODULEPROP_SHORTNAME ("ooSetupFactoryShortName" );
+static OUString MODULEPROP_UINAME ("ooSetupFactoryUIName" );
+static OUString CMDPROP_UINAME ("Name" );
-static ::rtl::OUString FOLDERNAME_UICONFIG (RTL_CONSTASCII_USTRINGPARAM("Configurations2" ));
+static OUString FOLDERNAME_UICONFIG ("Configurations2" );
-static ::rtl::OUString MEDIATYPE_PROPNAME (RTL_CONSTASCII_USTRINGPARAM("MediaType" ));
-static ::rtl::OUString MEDIATYPE_UICONFIG (RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.ui.configuration" ));
+static OUString MEDIATYPE_PROPNAME ("MediaType" );
+static OUString MEDIATYPE_UICONFIG ("application/vnd.sun.xml.ui.configuration");
//-----------------------------------------------
static sal_uInt16 KEYCODE_ARRAY[] =
@@ -848,8 +848,8 @@ void SfxAcceleratorConfigPage::InitAccCfg()
css::frame::ModuleManager::create(comphelper::getComponentContext(m_xSMGR)));
m_sModuleLongName = xModuleManager->identify(m_xFrame);
::comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName));
- m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, ::rtl::OUString());
- m_sModuleUIName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_UINAME , ::rtl::OUString());
+ m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, OUString());
+ m_sModuleUIName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_UINAME , OUString());
// get global accelerator configuration
m_xGlobal = css::ui::GlobalAcceleratorConfiguration::create(comphelper::getComponentContext(m_xSMGR));
@@ -929,7 +929,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
for (i2=0; i2<c2; ++i2)
{
const css::awt::KeyEvent& aAWTKey = lKeys[i2];
- ::rtl::OUString sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
+ OUString sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
String sLabel = GetLabel4Command(sCommand);
KeyCode aKeyCode = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(aAWTKey);
sal_uInt16 nPos = MapKeyCodeToPos(aKeyCode);
@@ -980,7 +980,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
while (pEntry)
{
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
- ::rtl::OUString sCommand ;
+ OUString sCommand ;
css::awt::KeyEvent aAWTKey ;
if (pUserData)
@@ -1071,7 +1071,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
// remove function name from selected entry
sal_uInt16 nCol = aEntriesBox.TabCount() - 1;
aEntriesBox.SetEntryText( String(), nPos, nCol );
- pEntry->m_sCommand = ::rtl::OUString();
+ pEntry->m_sCommand = OUString();
((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
return 0;
@@ -1086,7 +1086,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
{
sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
+ OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
aRemoveButton.Enable( sal_False );
aChangeButton.Enable( sal_False );
@@ -1115,7 +1115,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
{
sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
+ OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
if (pEntry->m_bIsConfigurable)
{
@@ -1205,7 +1205,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl)
{
DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
- ::rtl::OUString sCfgName;
+ OUString sCfgName;
if ( ERRCODE_NONE == m_pFileDlg->GetError() )
sCfgName = m_pFileDlg->GetPath();
@@ -1289,7 +1289,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
{
DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
- ::rtl::OUString sCfgName;
+ OUString sCfgName;
if ( ERRCODE_NONE == m_pFileDlg->GetError() )
sCfgName = m_pFileDlg->GetPath();
@@ -1332,7 +1332,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
css::uno::UNO_QUERY_THROW);
// set the correct media type if the storage was new created
- ::rtl::OUString sMediaType;
+ OUString sMediaType;
xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType;
if (sMediaType.isEmpty())
xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, css::uno::makeAny(MEDIATYPE_UICONFIG));
@@ -1497,7 +1497,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
if (xModuleConf.is())
{
::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
- String sLabel = String(lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, ::rtl::OUString()));
+ String sLabel = String(lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, OUString()));
if (sLabel.Len())
return sLabel;
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6603538c4b3a..ee6387ea3e25 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
namespace css = ::com::sun::star;
-static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UICategoryDescription") );
+static OUString SERVICE_UICATEGORYDESCRIPTION ("com.sun.star.ui.UICategoryDescription");
SfxStylesInfo_Impl::SfxStylesInfo_Impl()
{}
@@ -77,18 +77,18 @@ void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference< ::com:
m_xDoc = xModel;
}
-static ::rtl::OUString CMDURL_SPART (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?Style:string=") );
-static ::rtl::OUString CMDURL_FPART2 (RTL_CONSTASCII_USTRINGPARAM("&FamilyName:string=") );
+static OUString CMDURL_SPART (".uno:StyleApply?Style:string=");
+static OUString CMDURL_FPART2 ("&FamilyName:string=");
-static ::rtl::OUString CMDURL_STYLEPROT_ONLY (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?") );
-static ::rtl::OUString CMDURL_SPART_ONLY (RTL_CONSTASCII_USTRINGPARAM("Style:string=") );
-static ::rtl::OUString CMDURL_FPART_ONLY (RTL_CONSTASCII_USTRINGPARAM("FamilyName:string=") );
+static OUString CMDURL_STYLEPROT_ONLY (".uno:StyleApply?");
+static OUString CMDURL_SPART_ONLY ("Style:string=");
+static OUString CMDURL_FPART_ONLY ("FamilyName:string=");
-static ::rtl::OUString STYLEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
+static OUString STYLEPROP_UINAME ("DisplayName");
-::rtl::OUString SfxStylesInfo_Impl::generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle)
+OUString SfxStylesInfo_Impl::generateCommand(const OUString& sFamily, const OUString& sStyle)
{
- ::rtl::OUStringBuffer sCommand(1024);
+ OUStringBuffer sCommand(1024);
sCommand.append(CMDURL_SPART );
sCommand.append(sStyle );
sCommand.append(CMDURL_FPART2);
@@ -105,16 +105,16 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
if (aStyle.sCommand.indexOf(CMDURL_STYLEPROT_ONLY, 0) != 0)
return sal_False;
- aStyle.sFamily = ::rtl::OUString();
- aStyle.sStyle = ::rtl::OUString();
+ aStyle.sFamily = OUString();
+ aStyle.sStyle = OUString();
sal_Int32 nCmdLen = aStyle.sCommand.getLength();
- ::rtl::OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
+ OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
sal_Int32 i = sCmdArgs.indexOf('&');
if (i<0)
return sal_False;
- ::rtl::OUString sArg = sCmdArgs.copy(0, i);
+ OUString sArg = sCmdArgs.copy(0, i);
if (sArg.indexOf(CMDURL_SPART_ONLY) == 0)
aStyle.sStyle = sArg.copy(LEN_SPART, sArg.getLength()-LEN_SPART);
else if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
@@ -150,14 +150,14 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
if (xStyleSet.is())
xStyleSet->getByName(aStyle.sStyle) >>= xStyle;
- aStyle.sLabel = ::rtl::OUString();
+ aStyle.sLabel = OUString();
if (xStyle.is())
xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel;
}
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { aStyle.sLabel = ::rtl::OUString(); }
+ { aStyle.sLabel = OUString(); }
if (aStyle.sLabel.isEmpty())
{
@@ -173,7 +173,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
return ::std::vector< SfxStyleInfo_Impl >();
css::uno::Reference< css::container::XNameAccess > xCont = xModel->getStyleFamilies();
- css::uno::Sequence< ::rtl::OUString > lFamilyNames = xCont->getElementNames();
+ css::uno::Sequence< OUString > lFamilyNames = xCont->getElementNames();
::std::vector< SfxStyleInfo_Impl > lFamilies;
sal_Int32 c = lFamilyNames.getLength();
sal_Int32 i = 0;
@@ -205,11 +205,11 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
return lFamilies;
}
-::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const ::rtl::OUString& sFamily)
+::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& sFamily)
{
- static ::rtl::OUString PROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
+ static OUString PROP_UINAME ("DisplayName");
- css::uno::Sequence< ::rtl::OUString > lStyleNames;
+ css::uno::Sequence< OUString > lStyleNames;
css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameAccess > xFamilies = xModel->getStyleFamilies();
css::uno::Reference< css::container::XNameAccess > xStyleSet;
@@ -371,8 +371,8 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
Image m_libImage;
Image m_macImage;
Image m_docImage;
- ::rtl::OUString m_sMyMacros;
- ::rtl::OUString m_sProdMacros;
+ OUString m_sMyMacros;
+ OUString m_sProdMacros;
String m_sMacros;
String m_sDlgMacros;
String m_aHumanAppName;
@@ -454,8 +454,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
for (i1=0; i1<c1; ++i1)
{
sal_Int16& rGroupID = lGroups[i1];
- ::rtl::OUString sGroupID = ::rtl::OUString::valueOf((sal_Int32)rGroupID);
- ::rtl::OUString sGroupName ;
+ OUString sGroupID = OUString::valueOf((sal_Int32)rGroupID);
+ OUString sGroupName ;
try
{
@@ -543,7 +543,7 @@ namespace
//-----------------------------------------------
void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sModuleLongName)
+ const OUString& sModuleLongName)
{
SetUpdateMode(sal_False);
ClearAll(); // Remove all old entries from treelist box
@@ -572,13 +572,13 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
try
{
Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW );
+ OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
}
catch( Exception& e )
{
OSL_TRACE(" Caught some exception whilst retrieving browse nodes from factory... Exception: %s",
- ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+ OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
// TODO exception handling
}
@@ -612,8 +612,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
rootNode->getChildNodes();
sal_Bool bIsRootNode = sal_False;
- ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
- ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
+ OUString user("user");
+ OUString share("share");
if ( rootNode->getName() == "Root" )
{
bIsRootNode = sal_True;
@@ -625,7 +625,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
//set the bDisplay flag to FALSE if the current
//node is a first level child of the Root and is NOT
//either the current document, user or share
- ::rtl::OUString currentDocTitle;
+ OUString currentDocTitle;
Reference< XModel > xDocument( lcl_getScriptableDocument_nothrow( m_xFrame ) );
if ( xDocument.is() )
{
@@ -636,7 +636,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
Reference< browse::XBrowseNode >& theChild = children[n];
sal_Bool bDisplay = sal_True;
- ::rtl::OUString uiName = theChild->getName();
+ OUString uiName = theChild->getName();
if ( bIsRootNode )
{
if ( ! ((theChild->getName().equals( user ) || theChild->getName().equals( share ) ||
@@ -722,28 +722,28 @@ Image SfxConfigGroupListBox_Impl::GetImage(
Image aImage;
if ( bIsRootNode )
{
- ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
- ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
+ OUString user("user");
+ OUString share("share");
if (node->getName().equals( user ) || node->getName().equals(share ) )
{
aImage = pImp->m_hdImage;
}
else
{
- ::rtl::OUString factoryURL;
- ::rtl::OUString nodeName = node->getName();
+ OUString factoryURL;
+ OUString nodeName = node->getName();
Reference<XInterface> xDocumentModel = getDocumentModel(xCtx, nodeName );
if ( xDocumentModel.is() )
{
Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(xCtx) );
// get the long name of the document:
- ::rtl::OUString appModule( xModuleManager->identify(
+ OUString appModule( xModuleManager->identify(
xDocumentModel ) );
Sequence<beans::PropertyValue> moduleDescr;
Any aAny = xModuleManager->getByName(appModule);
if( sal_True != ( aAny >>= moduleDescr ) )
{
- throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue") ), Reference< XInterface >());
+ throw RuntimeException(OUString("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
}
beans::PropertyValue const * pmoduleDescr =
moduleDescr.getConstArray();
@@ -753,7 +753,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
{
pmoduleDescr[ pos ].Value >>= factoryURL;
OSL_TRACE("factory url for doc images is %s",
- ::rtl::OUStringToOString( factoryURL , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+ OUStringToOString( factoryURL , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
break;
}
}
@@ -779,7 +779,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
}
Reference< XInterface >
-SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
+SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xCtx, OUString& docName )
{
Reference< XInterface > xModel;
Reference< frame::XDesktop2 > desktop = frame::Desktop::create( xCtx );
@@ -794,7 +794,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
components->nextElement(), UNO_QUERY );
if ( model.is() )
{
- ::rtl::OUString sTdocUrl =
+ OUString sTdocUrl =
::comphelper::DocumentInfo::getDocumentTitle( model );
if( sTdocUrl.equals( docName ) )
{
@@ -807,9 +807,9 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
}
//-----------------------------------------------
-::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand)
+OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const OUString& sCommand)
{
- ::rtl::OUString sUIName;
+ OUString sUIName;
try
{
css::uno::Reference< css::container::XNameAccess > xModuleConf;
@@ -817,13 +817,13 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
if (xModuleConf.is())
{
::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
- sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ), ::rtl::OUString());
+ sUIName = lProps.getUnpackedValueOrDefault(OUString("Name"), OUString());
}
}
catch(const css::uno::RuntimeException&)
{ throw; }
catch(css::uno::Exception&)
- { sUIName = ::rtl::OUString(); }
+ { sUIName = OUString(); }
// fallback for missing UINames !?
if (sUIName.isEmpty())
@@ -866,7 +866,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
for (i=0; i<c; ++i)
{
const css::frame::DispatchInformation& rInfo = lCommands[i];
- ::rtl::OUString sUIName = MapCommand2UIName(rInfo.Command);
+ OUString sUIName = MapCommand2UIName(rInfo.Command);
SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL);
SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SLOT, 0);
pGrpInfo->sCommand = rInfo.Command;
@@ -894,7 +894,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
{
if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT)
{
- ::rtl::OUString uri;
+ OUString uri;
Reference < beans::XPropertySet >xPropSet( children[n], UNO_QUERY );
if (!xPropSet.is())
@@ -1019,8 +1019,8 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
rootNode->getChildNodes();
sal_Bool bIsRootNode = sal_False;
- ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
- ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share" ));
+ OUString user("user");
+ OUString share("share" );
if ( rootNode->getName() == "Root" )
{
bIsRootNode = sal_True;
@@ -1032,7 +1032,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
set the bDisplay flag to sal_False if the current
node is a first level child of the Root and is NOT
either the current document, user or share */
- ::rtl::OUString currentDocTitle;
+ OUString currentDocTitle;
Reference< XModel > xDocument( lcl_getScriptableDocument_nothrow( m_xFrame ) );
if ( xDocument.is() )
{
@@ -1043,7 +1043,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
for ( sal_Int32 n = 0; n < nLen; ++n )
{
Reference< browse::XBrowseNode >& theChild = children[n];
- ::rtl::OUString aName( theChild->getName() );
+ OUString aName( theChild->getName() );
sal_Bool bDisplay = sal_True;
if ( bIsRootNode )
{
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 53703752566d..b5b7566eb162 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -48,8 +48,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-static ::rtl::OUString aVndSunStarUNO( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.UNO:") );
-static ::rtl::OUString aVndSunStarScript( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:") );
+static OUString aVndSunStarUNO( "vnd.sun.star.UNO:" );
+static OUString aVndSunStarScript( "vnd.sun.star.script:" );
_SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
pAssignFT( NULL ),
@@ -226,7 +226,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage()
SvTreeListEntry* pE = rListBox.GetEntry( 0 );
while( pE )
{
- ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
+ OUString* pEventName = (OUString*)pE->GetUserData();
delete pEventName;
pE->SetUserData((void*)0);
pE = rListBox.NextSibling( pE );
@@ -322,7 +322,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
try
{
- ::rtl::OUString eventName;
+ OUString eventName;
if( m_xAppEvents.is() )
{
EventsHash::iterator h_itEnd = m_appEventsHash.end();
@@ -384,7 +384,7 @@ void _SvxMacroTabPage::Reset()
try
{
- ::rtl::OUString sEmpty;
+ OUString sEmpty;
if( m_xAppEvents.is() )
{
EventsHash::iterator h_itEnd = m_appEventsHash.end();
@@ -458,14 +458,14 @@ void IconLBoxString::Paint(
String aTxt( GetText() );
if( aTxt.Len() )
{
- ::rtl::OUString aURL( aTxt );
+ OUString aURL( aTxt );
sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO );
bool bUNO = nIndex == 0;
const Image* pImg = bUNO ? m_pComponentImg : m_pMacroImg;
aDevice.DrawImage( aPos, *pImg );
- ::rtl::OUString aPureMethod;
+ OUString aPureMethod;
if( bUNO )
{
sal_Int32 nBegin = aVndSunStarUNO.getLength();
@@ -513,12 +513,12 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
return;
}
- Sequence< ::rtl::OUString > eventNames = nameReplace->getElementNames();
- ::std::set< ::rtl::OUString > aEventNamesCache;
+ Sequence< OUString > eventNames = nameReplace->getElementNames();
+ ::std::set< OUString > aEventNamesCache;
::std::copy(
eventNames.getConstArray(),
eventNames.getConstArray() + eventNames.getLength(),
- ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aEventNamesCache, aEventNamesCache.end() )
+ ::std::insert_iterator< ::std::set< OUString > >( aEventNamesCache, aEventNamesCache.end() )
);
for ( EventDisplayNames::const_iterator displayableEvent = aDisplayNames.begin();
@@ -526,7 +526,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
++displayableEvent
)
{
- ::rtl::OUString sEventName( ::rtl::OUString::createFromAscii( displayableEvent->pAsciiEventName ) );
+ OUString sEventName( OUString::createFromAscii( displayableEvent->pAsciiEventName ) );
if ( !nameReplace->hasByName( sEventName ) )
continue;
@@ -537,12 +537,12 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
continue;
}
- ::rtl::OUString eventURL = h_it->second.second;
+ OUString eventURL = h_it->second.second;
String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
displayName += '\t';
SvTreeListEntry* _pE = rListBox.InsertEntry( displayName );
- ::rtl::OUString* pEventName = new ::rtl::OUString( sEventName );
+ OUString* pEventName = new OUString( sEventName );
_pE->SetUserData( (void*)pEventName );
String sNew( eventURL );
_pE->ReplaceItem( new IconLBoxString( _pE, 0, sNew,
@@ -608,10 +608,10 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
- ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
+ OUString* pEventName = (OUString*)pE->GetUserData();
- ::rtl::OUString sEventURL;
- ::rtl::OUString sEventType;
+ OUString sEventURL;
+ OUString sEventType;
if(pThis->bAppEvents)
{
EventsHash::iterator h_it = pThis->m_appEventsHash.find( *pEventName );
@@ -636,8 +636,8 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
if( pBtn == pImpl->pDeletePB )
{
// delete pressed
- sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script") );
- sEventURL = ::rtl::OUString();
+ sEventType = OUString( "Script" );
+ sEventURL = OUString();
if(!pThis->bAppEvents)
pThis->bDocModified = true;
}
@@ -654,7 +654,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
short ret = pAssignDlg->Execute();
if( ret )
{
- sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO"));
+ sEventType = OUString("UNO");
sEventURL = pAssignDlg->getURL();
if(!pThis->bAppEvents)
pThis->bDocModified = true;
@@ -670,7 +670,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
short ret = pDlg->Execute();
if ( ret )
{
- sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
+ sEventType = OUString("Script");
sEventURL = pDlg->GetScriptURL();
if(!pThis->bAppEvents)
pThis->bDocModified = true;
@@ -746,7 +746,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
{
return;
}
- Sequence< ::rtl::OUString > eventNames = m_xAppEvents->getElementNames();
+ Sequence< OUString > eventNames = m_xAppEvents->getElementNames();
sal_Int32 nEventCount = eventNames.getLength();
for(sal_Int32 nEvent = 0; nEvent < nEventCount; ++nEvent )
{
@@ -777,9 +777,9 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
}
// returns the two props EventType & Script for a given event name
-Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash )
+Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eventsHash )
{
- const ::std::pair< ::rtl::OUString, ::rtl::OUString >& rAssignedEvent( eventsHash[ eventName ] );
+ const ::std::pair< OUString, OUString >& rAssignedEvent( eventsHash[ eventName ] );
Any aReturn;
::comphelper::NamedValueCollection aProps;
@@ -795,10 +795,10 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
// converts the Any returned by GetByName into a pair which can be stored in
// the EventHash
-::std::pair< ::rtl::OUString, ::rtl::OUString > _SvxMacroTabPage::GetPairFromAny( Any aAny )
+::std::pair< OUString, OUString > _SvxMacroTabPage::GetPairFromAny( Any aAny )
{
Sequence< beans::PropertyValue > props;
- ::rtl::OUString type, url;
+ OUString type, url;
if( sal_True == ( aAny >>= props ) )
{
::comphelper::NamedValueCollection aProps( props );
@@ -872,8 +872,8 @@ SvxMacroAssignDlg::~SvxMacroAssignDlg()
IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
{
- ::rtl::OUString aMethodName = maMethodEdit.GetText();
- maURL = ::rtl::OUString();
+ OUString aMethodName = maMethodEdit.GetText();
+ maURL = OUString();
if( !aMethodName.isEmpty() )
{
maURL = aVndSunStarUNO;
@@ -883,7 +883,7 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
return 0;
}
-AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL )
+AssignComponentDialog::AssignComponentDialog( Window * pParent, const OUString& rURL )
: ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
, maMethodLabel( this, CUI_RES( FT_METHOD ) )
, maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
@@ -895,7 +895,7 @@ AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUS
FreeResource();
maOKButton.SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler));
- ::rtl::OUString aMethodName;
+ OUString aMethodName;
if( !maURL.isEmpty() )
{
sal_Int32 nIndex = maURL.indexOf( aVndSunStarUNO );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 65bfde5a69b6..49e02e527475 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -308,7 +308,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode
//#139111# some crash reports show that it might be unset
if ( !theChild.is() )
continue;
- ::rtl::OUString sUIName = theChild->getName();
+ OUString sUIName = theChild->getName();
sal_Bool bDisplay = sal_True;
if ( bIsRootNode
@@ -409,7 +409,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
try{
aModuleId = xModuleManager->identify( m_xFrame );
}catch(const uno::Exception&)
- { aModuleId = ::rtl::OUString(); }
+ { aModuleId = OUString(); }
Reference< container::XNameAccess > const xNameAccess(
frame::UICommandDescription::create(xContext) );
@@ -417,8 +417,8 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
Reference< container::XNameAccess > xAllCategories(
xMCF->createInstanceWithContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.UICategoryDescription" )),
+ OUString(
+ "com.sun.star.ui.UICategoryDescription" ),
xContext ),
UNO_QUERY );
@@ -494,7 +494,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
try
{
Reference< browse::XBrowseNodeFactory > xFac( xContext->getValueByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
+ OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
}
catch( const Exception& )
@@ -553,7 +553,7 @@ Image SvxConfigGroupListBox::GetImage(
Any aAny = xModuleManager->getByName(appModule);
if( sal_True != ( aAny >>= moduleDescr ) )
{
- throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue")), Reference< XInterface >());
+ throw RuntimeException(OUString("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
}
beans::PropertyValue const * pmoduleDescr =
moduleDescr.getConstArray();
@@ -706,7 +706,7 @@ void SvxConfigGroupListBox::GroupSelected()
}
SvxGroupInfo_Impl *_pGroupInfo = new SvxGroupInfo_Impl(
- SVX_CFGFUNCTION_SLOT, 123, aCmdURL, ::rtl::OUString() );
+ SVX_CFGFUNCTION_SLOT, 123, aCmdURL, OUString() );
pFunctionListBox->aArr.push_back( _pGroupInfo );
@@ -742,13 +742,13 @@ void SvxConfigGroupListBox::GroupSelected()
}
Any value = xPropSet->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URI")));
+ OUString("URI"));
value >>= uri;
try
{
value = xPropSet->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
+ OUString("Description"));
value >>= description;
}
catch (Exception &) {
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 3491cb75e92c..983893ac63b0 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -177,8 +177,8 @@ String SvxHyphenWordDialog::EraseUnusableHyphens_Impl(
// 1) remove all not usable hyphenation positions from the end of the string
nPos = nIdx == STRING_NOTFOUND ? 0 : nIdx + 1;
nPos1 = nPos; //save for later use in 2) below
- const rtl::OUString aTmp( sal_Unicode( HYPH_POS_CHAR ) );
- const rtl::OUString aEmpty;
+ const OUString aTmp( sal_Unicode( HYPH_POS_CHAR ) );
+ const OUString aEmpty;
while (nPos != STRING_NOTFOUND)
nPos = aTxt.SearchAndReplace( aTmp, aEmpty, nPos + 1 );
@@ -359,7 +359,7 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt
try
{
uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
- const rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "IsHyphAuto" ) );
+ const OUString aName( "IsHyphAuto" );
uno::Any aAny;
aAny <<= sal_True;
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index b5de0772b08b..d66a59577fb2 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -37,44 +37,44 @@ namespace offapp
using namespace ::com::sun::star::uno;
//--------------------------------------------------------------------
- static const ::rtl::OUString& getConnectionPoolNodeName()
+ static const OUString& getConnectionPoolNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ConnectionPool") );
+ static OUString s_sNodeName("org.openoffice.Office.DataAccess/ConnectionPool" );
return s_sNodeName;
}
//--------------------------------------------------------------------
- static const ::rtl::OUString& getEnablePoolingNodeName()
+ static const OUString& getEnablePoolingNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("EnablePooling"));
+ static OUString s_sNodeName("EnablePooling");
return s_sNodeName;
}
//--------------------------------------------------------------------
- static const ::rtl::OUString& getDriverSettingsNodeName()
+ static const OUString& getDriverSettingsNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverSettings"));
+ static OUString s_sNodeName("DriverSettings");
return s_sNodeName;
}
//--------------------------------------------------------------------
- static const ::rtl::OUString& getDriverNameNodeName()
+ static const OUString& getDriverNameNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverName"));
+ static OUString s_sNodeName("DriverName");
return s_sNodeName;
}
//--------------------------------------------------------------------
- static const ::rtl::OUString& getEnableNodeName()
+ static const OUString& getEnableNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Enable"));
+ static OUString s_sNodeName("Enable");
return s_sNodeName;
}
//--------------------------------------------------------------------
- static const ::rtl::OUString& getTimeoutNodeName()
+ static const OUString& getTimeoutNodeName()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Timeout"));
+ static OUString s_sNodeName("Timeout");
return s_sNodeName;
}
@@ -109,14 +109,14 @@ namespace offapp
// then look for which of them settings are stored in the configuration
OConfigurationNode aDriverSettings = aConnectionPoolRoot.openNode(getDriverSettingsNodeName());
- Sequence< ::rtl::OUString > aDriverKeys = aDriverSettings.getNodeNames();
- const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray();
- const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
+ Sequence< OUString > aDriverKeys = aDriverSettings.getNodeNames();
+ const OUString* pDriverKeys = aDriverKeys.getConstArray();
+ const OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
for (;pDriverKeys != pDriverKeysEnd; ++pDriverKeys)
{
// the name of the driver in this round
OConfigurationNode aThisDriverSettings = aDriverSettings.openNode(*pDriverKeys);
- ::rtl::OUString sThisDriverName;
+ OUString sThisDriverName;
aThisDriverSettings.getNodeValue(getDriverNameNodeName()) >>= sThisDriverName;
// look if we (resp. the driver manager) know this driver
@@ -176,7 +176,7 @@ namespace offapp
if (!aDriverSettings.isValid())
return;
- ::rtl::OUString sThisDriverName;
+ OUString sThisDriverName;
OConfigurationNode aThisDriverSettings;
const DriverPoolingSettings& rNewSettings = pDriverSettings->getSettings();
@@ -185,7 +185,7 @@ namespace offapp
++aLoop
)
{
- // need the name as ::rtl::OUString
+ // need the name as OUString
sThisDriverName = aLoop->sName;
// the sub-node for this driver
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 380a295b900b..f6d793494e69 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -111,40 +111,40 @@ int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
namespace
{
- static ::rtl::OUString impl_SystemFileOpenServiceName()
+ static OUString impl_SystemFileOpenServiceName()
{
- const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
+ const OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
{
#ifdef ENABLE_KDE4
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") );
+ return OUString("com.sun.star.ui.dialogs.KDE4FilePicker" );
#else
- return rtl::OUString();
+ return OUString();
#endif
}
else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
{
#ifdef ENABLE_KDE
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") );
+ return OUString("com.sun.star.ui.dialogs.KDEFilePicker");
#else
- return rtl::OUString();
+ return OUString();
#endif
}
else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")) )
{
#ifdef ENABLE_TDE
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.TDEFilePicker") );
+ return OUString("com.sun.star.ui.dialogs.TDEFilePicker");
#else
- return rtl::OUString();
+ return OUString();
#endif
}
#if defined WNT
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") );
+ return OUString("com.sun.star.ui.dialogs.SystemFilePicker");
#elif defined MACOSX
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") );
+ return OUString("com.sun.star.ui.dialogs.AquaFilePicker");
#else
- return rtl::OUString();
+ return OUString();
#endif
}
@@ -165,7 +165,7 @@ namespace
try
{
- ::rtl::OUString aFileService = impl_SystemFileOpenServiceName();
+ OUString aFileService = impl_SystemFileOpenServiceName();
Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration( aFileService );
if ( xEnum.is() && xEnum->hasMoreElements() )
bRet = true;
@@ -421,23 +421,23 @@ CanvasSettings::CanvasSettings() :
Any propValue(
makeAny( NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
- makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas")) ) ) ) );
+ OUString("nodepath"),
+ makeAny( OUString("/org.openoffice.Office.Canvas") ) ) ) );
mxForceFlagNameAccess.set(
xConfigProvider->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
+ OUString("com.sun.star.configuration.ConfigurationUpdateAccess"),
Sequence<Any>( &propValue, 1 ) ),
UNO_QUERY_THROW );
propValue = makeAny(
NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
- makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas/CanvasServiceList")) ) ) );
+ OUString("nodepath"),
+ makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) );
Reference<XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
Reference<XHierarchicalNameAccess> xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
@@ -454,7 +454,7 @@ CanvasSettings::CanvasSettings() :
if( xEntryNameAccess.is() )
{
Sequence<OUString> preferredImplementations;
- if( (xEntryNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredImplementations")) ) >>= preferredImplementations) )
+ if( (xEntryNameAccess->getByName( OUString("PreferredImplementations") ) >>= preferredImplementations) )
maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) );
}
@@ -492,7 +492,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const
pCurrImpl->trim() ),
UNO_QUERY_THROW );
bool bHasAccel(false);
- if( (xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("HardwareAcceleration"))) >>= bHasAccel) )
+ if( (xPropSet->getPropertyValue(OUString("HardwareAcceleration")) >>= bHasAccel) )
if( bHasAccel )
{
mbHWAccelAvailable = true;
@@ -520,7 +520,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const
if( !mxForceFlagNameAccess.is() )
return true;
- if( !(mxForceFlagNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")) ) >>= bForceLastEntry) )
+ if( !(mxForceFlagNameAccess->getByName( OUString("ForceSafeServiceImpl") ) >>= bForceLastEntry) )
return true;
return !bForceLastEntry;
@@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const
if( !xNameReplace.is() )
return;
- xNameReplace->replaceByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")),
+ xNameReplace->replaceByName( OUString("ForceSafeServiceImpl"),
makeAny(!_bEnabled) );
Reference< XChangesBatch > xChangesBatch(
@@ -625,7 +625,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
{
::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
- aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") );
+ aAutoStr += OUString(" (" );
// prefer the icon style set by the desktop native widgets modules
sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
@@ -990,12 +990,12 @@ struct LanguageConfig_Impl
static sal_Bool bLanguageCurrentDoc_Impl = sal_False;
// some things we'll need...
-static const OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess"));
-static const OUString sAccessUpdSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
-static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/InstalledLocales"));
-static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General"));
-//static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic"));
-static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
+static const OUString sAccessSrvc("com.sun.star.configuration.ConfigurationAccess");
+static const OUString sAccessUpdSrvc("com.sun.star.configuration.ConfigurationUpdateAccess");
+static const OUString sInstalledLocalesPath("org.openoffice.Setup/Office/InstalledLocales");
+static OUString sUserLocalePath("org.openoffice.Office.Linguistic/General");
+//static const OUString sUserLocalePath("org.openoffice.Office/Linguistic");
+static const OUString sUserLocaleKey("UILocale");
static Sequence< OUString > seqInstalledLanguages;
static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocaleWrapper )
@@ -1072,7 +1072,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
Reference< XNameAccess > theNameAccess;
// find out which locales are currently installed and add them to the listbox
- theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), makeAny(sInstalledLocalesPath)));
+ theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(sInstalledLocalesPath)));
theNameAccess = Reference< XNameAccess > (
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
seqInstalledLanguages = theNameAccess->getElementNames();
@@ -1091,7 +1091,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
// find out whether the user has a specific locale specified
Sequence< Any > theArgs2(1);
- theArgs2[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), makeAny(sUserLocalePath)));
+ theArgs2[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(sUserLocalePath)));
theNameAccess = Reference< XNameAccess > (
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW );
if (theNameAccess->hasByName(sUserLocaleKey))
@@ -1267,7 +1267,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
com::sun::star::configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext()));
Sequence< Any > theArgs(1);
- theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), makeAny(sUserLocalePath)));
+ theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(sUserLocalePath)));
Reference< XPropertySet >xProp(
theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW );
if ( !m_sUserLocaleValue.equals(aLangString))
@@ -1285,7 +1285,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
Reference< XMultiServiceFactory > theMSF(
comphelper::getProcessServiceFactory());
Reference< XInitialization > xInit(theMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))), UNO_QUERY);
+ OUString("com.sun.star.office.Quickstart")), UNO_QUERY);
if (xInit.is())
{
Sequence< Any > args(3);
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 08def3192ade..c8bd32a87c2a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -130,7 +130,7 @@ void SvxNoSpaceEdit::Modify()
if ( bOnlyNumeric )
{
- rtl::OUString aValue = GetText();
+ OUString aValue = GetText();
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
// the maximum value of a port number is USHRT_MAX
@@ -170,14 +170,14 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
aNoProxyForED (this, CUI_RES( ED_NOPROXYFOR )),
aNoProxyDescFT (this, CUI_RES( ED_NOPROXYDESC )),
sFromBrowser ( CUI_RES( ST_PROXY_FROM_BROWSER ) ),
- aProxyModePN(RTL_CONSTASCII_USTRINGPARAM("ooInetProxyType")),
- aHttpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyName")),
- aHttpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyPort")),
- aHttpsProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPSProxyName")),
- aHttpsPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPSProxyPort")),
- aFtpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetFTPProxyName")),
- aFtpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetFTPProxyPort")),
- aNoProxyDescPN(RTL_CONSTASCII_USTRINGPARAM("ooInetNoProxy"))
+ aProxyModePN("ooInetProxyType"),
+ aHttpProxyPN("ooInetHTTPProxyName"),
+ aHttpPortPN("ooInetHTTPProxyPort"),
+ aHttpsProxyPN("ooInetHTTPSProxyName"),
+ aHttpsPortPN("ooInetHTTPSProxyPort"),
+ aFtpProxyPN("ooInetFTPProxyName"),
+ aFtpPortPN("ooInetFTPProxyPort"),
+ aNoProxyDescPN("ooInetNoProxy")
{
FreeResource();
@@ -196,18 +196,18 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext() ) );
- OUString aConfigRoot(RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings" ) );
+ OUString aConfigRoot( "org.openoffice.Inet/Settings" );
beans::NamedValue aProperty;
- aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+ aProperty.Name = OUString( "nodepath" );
aProperty.Value = makeAny( aConfigRoot );
Sequence< Any > aArgumentList( 1 );
aArgumentList[0] = makeAny( aProperty );
- m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ),
- aArgumentList );
+ m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments(
+ OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ),
+ aArgumentList );
ArrangeControls_Impl();
}
@@ -575,10 +575,10 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
{
- rtl::OUString aValue = pEdit->GetText();
+ OUString aValue = pEdit->GetText();
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
- pEdit->SetText( rtl::OUString('0') );
+ pEdit->SetText( OUString('0') );
return 0;
}
@@ -811,7 +811,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
if (!mpCertPathDlg)
mpCertPathDlg = new CertPathDialog(this);
- rtl::OUString sOrig = mpCertPathDlg->getDirectory();
+ OUString sOrig = mpCertPathDlg->getDirectory();
short nRet = mpCertPathDlg->Execute();
if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory())
@@ -833,7 +833,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
}
catch (const Exception& e)
{
- OSL_FAIL(rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
+ OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
(void)e;
}
return 0;
@@ -1002,15 +1002,15 @@ extern "C" {
#endif
#define NPP_PATH_MAX 2048
-inline bool getDllURL(rtl::OString * path)
+inline bool getDllURL(OString * path)
{
OSL_ASSERT(path != NULL);
- ::rtl::OUString dirPath/*dllPath, */;
+ OUString dirPath/*dllPath, */;
if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
return false;
}
dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
- ::rtl::OUString sysDirPath;
+ OUString sysDirPath;
osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
*path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
return true;
@@ -1039,7 +1039,7 @@ sal_Bool MozPluginTabPage::isInstalled()
// get the real file path
char realFilePath[NPP_PATH_MAX] = {0};
- ::rtl::OString tempString;
+ OString tempString;
if (!getDllURL(&tempString)) {
return false;
}
@@ -1053,7 +1053,7 @@ sal_Bool MozPluginTabPage::isInstalled()
#ifdef WNT
// get the value from registry
sal_Bool ret = true;
- ::rtl::OString tempString;
+ OString tempString;
char realFilePath[NPP_PATH_MAX] = {0};
if (!getDllURL(&tempString)){
return false;
@@ -1090,7 +1090,7 @@ sal_Bool MozPluginTabPage::installPlugin()
// get the real file path
char realFilePath[NPP_PATH_MAX] = {0};
- ::rtl::OString tempString;
+ OString tempString;
if (!getDllURL(&tempString)) {
return false;
}
@@ -1103,7 +1103,7 @@ sal_Bool MozPluginTabPage::installPlugin()
return true;
#endif
#ifdef WNT
- ::rtl::OString tempString;
+ OString tempString;
char realFilePath[NPP_PATH_MAX] = {0};
if (!getDllURL(&tempString)) {
return false;
@@ -1130,7 +1130,7 @@ sal_Bool MozPluginTabPage::uninstallPlugin()
return true;
#endif
#ifdef WNT
- ::rtl::OString tempString;
+ OString tempString;
char realFilePath[NPP_PATH_MAX] = {0};
if (!getDllURL(&tempString)) {
return false;
@@ -1159,7 +1159,7 @@ public:
virtual ~MailerProgramCfg_Impl();
virtual void Commit();
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+ virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
};
/* -------------------------------------------------------------------------*/
@@ -1239,7 +1239,7 @@ void MailerProgramCfg_Impl::Commit()
PutProperties(aNames, aValues);
}
-void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& )
{
}
@@ -1343,14 +1343,14 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
FileDialogHelper aHelper(
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
0 );
- rtl::OUString sPath = aMailerURLED.GetText();
+ OUString sPath = aMailerURLED.GetText();
if ( sPath.isEmpty() )
- sPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/usr/bin"));
+ sPath = OUString("/usr/bin");
- rtl::OUString sUrl;
+ OUString sUrl;
::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath, sUrl);
aHelper.SetDisplayDirectory(sUrl);
- aHelper.AddFilter( m_sDefaultFilterName, rtl::OUString("*"));
+ aHelper.AddFilter( m_sDefaultFilterName, OUString("*"));
if ( ERRCODE_NONE == aHelper.Execute() )
{
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 21c04140f005..c794bdd2e0e8 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -133,7 +133,7 @@ static sal_Int32 lcl_SeqGetEntryPos(
return i < nLen ? i : -1;
}
-static void lcl_OpenURL( ::rtl::OUString sURL )
+static void lcl_OpenURL( OUString sURL )
{
if ( !sURL.isEmpty() )
{
@@ -144,12 +144,12 @@ static void lcl_OpenURL( ::rtl::OUString sURL )
::comphelper::getProcessComponentContext();
uno::Reference< css::system::XSystemShellExecute > xSystemShell(
css::system::SystemShellExecute::create(xContext) );
- xSystemShell->execute( sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
+ xSystemShell->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch( const uno::Exception& e )
{
OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
- rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
}
}
}
@@ -375,7 +375,7 @@ static const char * aEidToPropName[] =
static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId )
{
DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" );
- return rtl::OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] );
+ return OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] );
}
// class OptionsUserData -------------------------------------------------
@@ -474,7 +474,7 @@ void BrwString_Impl::Paint(
OptionsUserData aData( (sal_uLong) pEntry->GetUserData() );
if(aData.HasNumericValue())
{
- rtl::OUStringBuffer sTxt;
+ OUStringBuffer sTxt;
sTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
rDev.SetFont( aFont );
rDev.DrawText( aNewPos, sTxt.makeStringAndClear() );
@@ -1108,7 +1108,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
- RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionaries/" ) ) );
+ "http://extensions.libreoffice.org/dictionaries/" ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) );
}
else
@@ -1579,7 +1579,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl)
IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
{
- ::rtl::OUString sURL( aMoreDictsLink.GetURL() );
+ OUString sURL( aMoreDictsLink.GetURL() );
lcl_OpenURL( sURL );
return 0;
}
@@ -1962,7 +1962,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
- RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionaries/" ) ) );
+ "http://extensions.libreoffice.org/dictionaries/" ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) );
}
else
@@ -2405,7 +2405,7 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl)
IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl)
{
- ::rtl::OUString sURL( aMoreDictsLink.GetURL() );
+ OUString sURL( aMoreDictsLink.GetURL() );
lcl_OpenURL( sURL );
return 0;
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index d63081e505e8..2ca777b5b3d7 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -66,11 +66,11 @@ using namespace svx;
#define ITEMID_TYPE 1
#define ITEMID_PATH 2
-#define POSTFIX_INTERNAL rtl::OUString("_internal")
-#define POSTFIX_USER rtl::OUString("_user")
-#define POSTFIX_WRITABLE rtl::OUString("_writable")
-#define VAR_ONE rtl::OUString("%1")
-#define IODLG_CONFIGNAME rtl::OUString("FilePicker_Save")
+#define POSTFIX_INTERNAL OUString("_internal")
+#define POSTFIX_USER OUString("_user")
+#define POSTFIX_WRITABLE OUString("_writable")
+#define VAR_ONE OUString("%1")
+#define IODLG_CONFIGNAME OUString("FilePicker_Save")
// struct OptPath_Impl ---------------------------------------------------
@@ -133,7 +133,7 @@ static String getCfgName_Impl( sal_uInt16 _nHandle )
if ( Hdl2CfgMap_Impl[ nIndex ].m_nHandle == _nHandle )
{
// config name found
- sCfgName = rtl::OUString::createFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
+ sCfgName = OUString::createFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
break;
}
++nIndex;
@@ -486,7 +486,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder )
// old path is an URL?
INetURLObject aObj( sWritable );
bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID );
- rtl::OUString aPathStr( _rFolder );
+ OUString aPathStr( _rFolder );
INetURLObject aNewObj( aPathStr );
aNewObj.removeFinalSlash();
@@ -723,8 +723,7 @@ void SvxPathTabPage::GetPathList(
{
Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory();
pImpl->m_xPathSettings = Reference< XPropertySet >( xSMgr->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.util.PathSettings") ) ), UNO_QUERY );
+ OUString( "com.sun.star.util.PathSettings" ) ), UNO_QUERY );
}
try
@@ -736,11 +735,11 @@ void SvxPathTabPage::GetPathList(
sProp = sCfgName;
sProp += POSTFIX_INTERNAL;
Any aAny = pImpl->m_xPathSettings->getPropertyValue( sProp );
- Sequence< ::rtl::OUString > aPathSeq;
+ Sequence< OUString > aPathSeq;
if ( aAny >>= aPathSeq )
{
long i, nCount = aPathSeq.getLength();
- const ::rtl::OUString* pPaths = aPathSeq.getConstArray();
+ const OUString* pPaths = aPathSeq.getConstArray();
for ( i = 0; i < nCount; ++i )
{
@@ -756,7 +755,7 @@ void SvxPathTabPage::GetPathList(
if ( aAny >>= aPathSeq )
{
long i, nCount = aPathSeq.getLength();
- const ::rtl::OUString* pPaths = aPathSeq.getConstArray();
+ const OUString* pPaths = aPathSeq.getConstArray();
for ( i = 0; i < nCount; ++i )
{
@@ -769,7 +768,7 @@ void SvxPathTabPage::GetPathList(
sProp = sCfgName;
sProp += POSTFIX_WRITABLE;
aAny = pImpl->m_xPathSettings->getPropertyValue( sProp );
- ::rtl::OUString sWritablePath;
+ OUString sWritablePath;
if ( aAny >>= sWritablePath )
_rWritablePath = String( sWritablePath );
@@ -798,8 +797,7 @@ void SvxPathTabPage::SetPathList(
{
Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory();
pImpl->m_xPathSettings = Reference< XPropertySet >( xSMgr->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.util.PathSettings") ) ), UNO_QUERY );
+ "com.sun.star.util.PathSettings" ), UNO_QUERY );
}
try
@@ -809,10 +807,10 @@ void SvxPathTabPage::SetPathList(
// save user paths
char cDelim = MULTIPATH_DELIMITER;
sal_uInt16 nCount = comphelper::string::getTokenCount(_rUserPath, cDelim);
- Sequence< ::rtl::OUString > aPathSeq( nCount );
- ::rtl::OUString* pArray = aPathSeq.getArray();
+ Sequence< OUString > aPathSeq( nCount );
+ OUString* pArray = aPathSeq.getArray();
for ( sal_uInt16 i = 0; i < nCount; ++i )
- pArray[i] = ::rtl::OUString( _rUserPath.GetToken( i, cDelim ) );
+ pArray[i] = OUString( _rUserPath.GetToken( i, cDelim ) );
String sProp( sCfgName );
sProp += POSTFIX_USER;
Any aValue = makeAny( aPathSeq );
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 904679266fd1..eb59b4ec3b87 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -170,8 +170,8 @@ void WebConnectionInfoDialog::FillPasswordList()
{
for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ )
{
- ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url );
- aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' );
+ OUString aUIEntry( aURLEntries[nURLInd].Url );
+ aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName;
SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
@@ -181,7 +181,7 @@ void WebConnectionInfoDialog::FillPasswordList()
// remember pos of first url container entry.
m_nPos = nCount;
- uno::Sequence< rtl::OUString > aUrls
+ uno::Sequence< OUString > aUrls
= xMasterPasswd->getUrls( sal_True /* OnlyPersistent */ );
for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
@@ -241,7 +241,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
// should the master password be requested before?
xPasswdContainer->removeAllPersistent();
- uno::Sequence< rtl::OUString > aUrls
+ uno::Sequence< OUString > aUrls
= xPasswdContainer->getUrls( sal_True /* OnlyPersistent */ );
for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
xPasswdContainer->removeUrl( aUrls[ nURLIdx ] );
@@ -277,7 +277,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
if ( pPasswordRequest->isPassword() )
{
String aNewPass = pPasswordRequest->getPassword();
- uno::Sequence< ::rtl::OUString > aPasswd( 1 );
+ uno::Sequence< OUString > aPasswd( 1 );
aPasswd[0] = aNewPass;
uno::Reference< task::XPasswordContainer2 > xPasswdContainer(
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 8f451d60bd99..6c5d2fb80949 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -726,7 +726,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
*pUserData->pFont = aFont;
sal_UCS4 aChar = pMapDlg->GetChar();
// using the UCS4 constructor
- rtl::OUString aOUStr( &aChar, 1 );
+ OUString aOUStr( &aChar, 1 );
*pUserData->pString = aOUStr;
}
delete pMapDlg;
@@ -1323,7 +1323,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
aReplaceTLB.GetEntryText( pFirstSel, 1 ) );
if( bEnableNew )
{
- for(std::set<rtl::OUString>::iterator i = aFormatText.begin(); i != aFormatText.end(); ++i)
+ for(std::set<OUString>::iterator i = aFormatText.begin(); i != aFormatText.end(); ++i)
{
if((*i).equals(rShortTxt))
{
@@ -1337,9 +1337,9 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
return 0;
}
-static sal_Bool lcl_FindInArray(std::vector<rtl::OUString>& rStrings, const String& rString)
+static sal_Bool lcl_FindInArray(std::vector<OUString>& rStrings, const String& rString)
{
- for(std::vector<rtl::OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i)
+ for(std::vector<OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i)
{
if((*i).equals(rString))
{
@@ -1446,7 +1446,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
}
}
- for(std::vector<rtl::OUString>::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
+ for(std::vector<OUString>::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
{
String* s = new String(*it);
if(!pWrdList->insert(s).second)
@@ -1471,7 +1471,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
}
}
- for(std::vector<rtl::OUString>::iterator it = rArrays.aAbbrevStrings.begin(); it != rArrays.aAbbrevStrings.end(); ++it)
+ for(std::vector<OUString>::iterator it = rArrays.aAbbrevStrings.begin(); it != rArrays.aAbbrevStrings.end(); ++it)
{
String* s = new String(*it);
if(!pCplList->insert(s).second)
@@ -1580,10 +1580,10 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset,
sal_uInt16 i;
for(i = 0; i < aAbbrevLB.GetEntryCount(); i++)
- pArrays->aAbbrevStrings.push_back(rtl::OUString(aAbbrevLB.GetEntry(i)));
+ pArrays->aAbbrevStrings.push_back(OUString(aAbbrevLB.GetEntry(i)));
for(i = 0; i < aDoubleCapsLB.GetEntryCount(); i++)
- pArrays->aDoubleCapsStrings.push_back(rtl::OUString(aDoubleCapsLB.GetEntry(i)));
+ pArrays->aDoubleCapsStrings.push_back(OUString(aDoubleCapsLB.GetEntry(i)));
}
aDoubleCapsLB.Clear();
aAbbrevLB.Clear();
@@ -1594,10 +1594,10 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset,
if(aStringsTable.find(eLang) != aStringsTable.end())
{
StringsArrays& rArrays = aStringsTable[eLang];
- for(std::vector<rtl::OUString>::iterator i = rArrays.aAbbrevStrings.begin(); i != rArrays.aAbbrevStrings.end(); ++i)
+ for(std::vector<OUString>::iterator i = rArrays.aAbbrevStrings.begin(); i != rArrays.aAbbrevStrings.end(); ++i)
aAbbrevLB.InsertEntry(*i);
- for(std::vector<rtl::OUString>::iterator i = rArrays.aDoubleCapsStrings.begin(); i != rArrays.aDoubleCapsStrings.end(); ++i)
+ for(std::vector<OUString>::iterator i = rArrays.aDoubleCapsStrings.begin(); i != rArrays.aDoubleCapsStrings.end(); ++i)
aDoubleCapsLB.InsertEntry(*i);
}
else
@@ -2105,7 +2105,7 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
}
aStrCodes[ nFullLen++ ] = ')';
// using the new UCS4 constructor
- rtl::OUString aOUStr( aStrCodes, nFullLen );
+ OUString aOUStr( aStrCodes, nFullLen );
return aOUStr;
}
@@ -2311,7 +2311,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable > xRef( pCntnr );
- rtl::OStringBuffer sData;
+ OStringBuffer sData;
const sal_Char aLineEnd[] =
#if defined(WNT)
"\015\012";
@@ -2323,7 +2323,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
for( sal_uInt16 n = 0; n < nSelCnt; ++n )
{
- sData.append(rtl::OUStringToOString(aLBEntries.GetSelectEntry(n),
+ sData.append(OUStringToOString(aLBEntries.GetSelectEntry(n),
nEncode));
sData.append(RTL_CONSTASCII_STRINGPARAM(aLineEnd));
}
@@ -2395,11 +2395,11 @@ SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet
*/
struct ImplSmartTagLBUserData
{
- rtl::OUString maSmartTagType;
+ OUString maSmartTagType;
uno::Reference< smarttags::XSmartTagRecognizer > mxRec;
sal_Int32 mnSmartTagIdx;
- ImplSmartTagLBUserData( const rtl::OUString& rSmartTagType,
+ ImplSmartTagLBUserData( const OUString& rSmartTagType,
uno::Reference< smarttags::XSmartTagRecognizer > xRec,
sal_Int32 nSmartTagIdx ) :
maSmartTagType( rSmartTagType ),
@@ -2437,21 +2437,21 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr )
{
uno::Reference< smarttags::XSmartTagRecognizer > xRec = rSmartTagMgr.GetRecognizer(i);
- const rtl::OUString aName = xRec->getName( aLocale );
+ const OUString aName = xRec->getName( aLocale );
const sal_Int32 nNumberOfSupportedSmartTags = xRec->getSmartTagCount();
for ( sal_Int32 j = 0; j < nNumberOfSupportedSmartTags; ++j )
{
- const rtl::OUString aSmartTagType = xRec->getSmartTagName(j);
- rtl::OUString aSmartTagCaption = rSmartTagMgr.GetSmartTagCaption( aSmartTagType, aLocale );
+ const OUString aSmartTagType = xRec->getSmartTagName(j);
+ OUString aSmartTagCaption = rSmartTagMgr.GetSmartTagCaption( aSmartTagType, aLocale );
if ( aSmartTagCaption.isEmpty() )
aSmartTagCaption = aSmartTagType;
- const rtl::OUString aLBEntry = aSmartTagCaption +
- OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) +
+ const OUString aLBEntry = aSmartTagCaption +
+ OUString(" (") +
aName +
- OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ OUString(")");
SvTreeListEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry );
if ( pEntry )
@@ -2535,7 +2535,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& )
return sal_False;
sal_Bool bModifiedSmartTagTypes = sal_False;
- std::vector< rtl::OUString > aDisabledSmartTagTypes;
+ std::vector< OUString > aDisabledSmartTagTypes;
const sal_uLong nCount = m_aSmartTagTypesLB.GetEntryCount();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 10:24:58 +0000