diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /cui | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'cui')
85 files changed, 515 insertions, 532 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index f1dda16992b2..fd8a03bcfbb4 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1430,7 +1430,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) // change te description of the radio button, which switch to the module // dependend accelerator configuration String sButtonText = aModuleButton.GetText(); - sButtonText.SearchAndReplace(rtl::OUString("$(MODULE)"), m_sModuleUIName); + sButtonText.SearchAndReplace(OUString("$(MODULE)"), m_sModuleUIName); aModuleButton.SetText(sButtonText); if (m_xModule.is()) @@ -1515,7 +1515,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand) } else { - String aRet(rtl::OUString("Symbols: ")); + String aRet(OUString("Symbols: ")); xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string="); if ( nPos == 0 ) { diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 63497966709d..5928ee39a735 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -92,7 +92,7 @@ #include "dlgname.hxx" -#define PRTSTR(x) rtl::OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer +#define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer #define ENTRY_HEIGHT 16 @@ -118,7 +118,6 @@ static const char aMenuSeparatorStr[] = " | "; #pragma warning (disable:4355) #endif -using rtl::OUString; namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; namespace lang = com::sun::star::lang; @@ -440,7 +439,7 @@ OUString GetModuleName( const OUString& aModuleId ) else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" ) return OUString("Database" ); - return ::rtl::OUString(); + return OUString(); } OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css::frame::XModuleManager2 >& rModuleManager ) @@ -593,7 +592,7 @@ ConvertSvxConfigEntry( uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); + aPropSeq[0].Value <<= OUString( pEntry->GetCommand() ); aPropSeq[1].Name = aDescriptorType; aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; @@ -636,16 +635,16 @@ ConvertSvxConfigEntry( if ( isDefaultName ) { - aPropSeq[2].Value <<= rtl::OUString(); + aPropSeq[2].Value <<= OUString(); } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } return aPropSeq; @@ -671,7 +670,7 @@ ConvertToolbarEntry( uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); + aPropSeq[0].Value <<= OUString( pEntry->GetCommand() ); aPropSeq[1].Name = aDescriptorType; aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; @@ -714,16 +713,16 @@ ConvertToolbarEntry( if ( isDefaultName ) { - aPropSeq[2].Value <<= rtl::OUString(); + aPropSeq[2].Value <<= OUString(); } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } aPropSeq[3].Name = aIsVisible; @@ -754,7 +753,7 @@ SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet ) sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFrame ) { - static ::rtl::OUString MODULEID_STARTMODULE ("com.sun.star.frame.StartModule" ); + static OUString MODULEID_STARTMODULE ("com.sun.star.frame.StartModule" ); try { @@ -764,7 +763,7 @@ sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFram if (xFrame.is()) { - ::rtl::OUString sModuleId = xMM->identify(xFrame); + OUString sModuleId = xMM->identify(xFrame); if ( ( !sModuleId.isEmpty() ) && (!sModuleId.equals(MODULEID_STARTMODULE)) @@ -1061,8 +1060,8 @@ MenuSaveInData::GetEntries() if ( pRootEntry == NULL ) { pRootEntry = new SvxConfigEntry( - rtl::OUString("MainMenus"), - rtl::OUString(), sal_True); + OUString("MainMenus"), + OUString(), sal_True); if ( m_xMenuSettings.is() ) { @@ -1795,7 +1794,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) try{ aCheckId = xModuleManager->identify( xf ); } catch(const uno::Exception&) - { aCheckId = ::rtl::OUString(); } + { aCheckId = OUString(); } if ( aModuleId.equals( aCheckId ) ) { @@ -1858,9 +1857,9 @@ void SvxConfigPage::Reset( const SfxItemSet& ) } } -::rtl::OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::XFrame >& _inout_rxFrame ) +OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::XFrame >& _inout_rxFrame ) { - ::rtl::OUString sModuleID; + OUString sModuleID; try { uno::Reference< uno::XComponentContext > xContext( @@ -2157,7 +2156,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( if (pNewEntryData->IsSeparator()) { pNewEntry = aContentsListBox->InsertEntry( - rtl::OUString(aSeparatorStr), + OUString(aSeparatorStr), 0, sal_False, nPos, pNewEntryData); } else @@ -3895,10 +3894,10 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, bool, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ToolbarInfo; + OUStringHash, + ::std::equal_to< OUString > > ToolbarInfo; ToolbarInfo aToolbarInfo; @@ -3906,8 +3905,8 @@ SvxEntries* ToolbarSaveInData::GetEntries() { pRootEntry = new SvxConfigEntry( - rtl::OUString("MainToolbars"), - rtl::OUString(), sal_True); + OUString("MainToolbars"), + OUString(), sal_True); uno::Sequence< uno::Sequence < beans::PropertyValue > > info = GetConfigManager()->getUIElementsInfo( @@ -4991,10 +4990,10 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { FreeResource(); - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, bool, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ImageInfo; + OUStringHash, + ::std::equal_to< OUString > > ImageInfo; aTbSymbol.SetPageScroll( sal_True ); @@ -5015,12 +5014,12 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, graphic::GraphicProvider::create( xComponentContext ) ); uno::Reference< beans::XPropertySet > xPropSet( - xServiceManager->createInstance( ::rtl::OUString("com.sun.star.util.PathSettings" ) ), + xServiceManager->createInstance( OUString("com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY ); - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "UserConfig" ) ); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "UserConfig" ) ); - ::rtl::OUString aDirectory; + OUString aDirectory; aAny >>= aDirectory; @@ -5031,7 +5030,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, sal_Unicode aChar = aDirectory[ aCount-1 ]; if ( aChar != '/') { - aDirectory += ::rtl::OUString( "/" ); + aDirectory += OUString( "/" ); } } else @@ -5039,7 +5038,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, aBtnImport.Enable( sal_False ); } - aDirectory += ::rtl::OUString( "soffice.cfg/import" ); + aDirectory += OUString( "soffice.cfg/import" ); uno::Reference< lang::XSingleServiceFactory > xStorageFactory( ::com::sun::star::embed::FileSystemStorageFactory::create( xComponentContext ) ); @@ -5054,17 +5053,17 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, uno::Sequence< uno::Any > aProp( 2 ); beans::PropertyValue aPropValue; - aPropValue.Name = ::rtl::OUString( "UserConfigStorage" ); + aPropValue.Name = OUString( "UserConfigStorage" ); aPropValue.Value <<= xStorage; aProp[ 0 ] <<= aPropValue; - aPropValue.Name = ::rtl::OUString( "OpenMode" ); + aPropValue.Name = OUString( "OpenMode" ); aPropValue.Value <<= com::sun::star::embed::ElementModes::READWRITE; aProp[ 1 ] <<= aPropValue; m_xImportedImageManager = uno::Reference< com::sun::star::ui::XImageManager >( xServiceManager->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.ui.ImageManager" ), aProp ), + OUString("com.sun.star.ui.ImageManager" ), aProp ), uno::UNO_QUERY ); ImageInfo mImageInfo; @@ -5219,7 +5218,7 @@ IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox ) sal_uInt16 nId = aTbSymbol.GetCurItemId(); aTbSymbol.CheckItem( nId ); - ::rtl::OUString aSelImageText = aTbSymbol.GetItemText( nId ); + OUString aSelImageText = aTbSymbol.GetItemText( nId ); if ( m_xImportedImageManager->hasImage( GetImageType(), aSelImageText ) ) { aBtnDelete.Enable( sal_True ); @@ -5251,7 +5250,7 @@ IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton ) } aImportDialog.SetCurrentFilter( - rtl::OUString("PNG - Portable Network Graphic")); + OUString("PNG - Portable Network Graphic")); if ( ERRCODE_NONE == aImportDialog.Execute() ) { @@ -5279,7 +5278,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) if ( aTbSymbol.IsItemChecked( nId ) ) { - ::rtl::OUString aSelImageText = aTbSymbol.GetItemText( nId ); + OUString aSelImageText = aTbSymbol.GetItemText( nId ); uno::Sequence< OUString > URLs(1); URLs[0] = aSelImageText; aTbSymbol.RemoveItem( aTbSymbol.GetItemPos( nId ) ); @@ -5298,7 +5297,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) } bool SvxIconSelectorDialog::ReplaceGraphicItem( - const ::rtl::OUString& aURL ) + const OUString& aURL ) { uno::Sequence< OUString > URLs(1); uno::Sequence< uno::Reference<graphic::XGraphic > > aImportGraph( 1 ); @@ -5307,7 +5306,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< graphic::XGraphic > xGraphic; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); aMediaProps[0].Value <<= aURL; com::sun::star::awt::Size aSize; @@ -5386,7 +5385,7 @@ void SvxIconSelectorDialog::ImportGraphics( uno::Sequence< OUString > URLs(1); uno::Sequence< uno::Reference<graphic::XGraphic > > aImportGraph( 1 ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPer( m_xImportedImageManager, uno::UNO_QUERY ); @@ -5413,13 +5412,13 @@ void SvxIconSelectorDialog::ImportGraphics( } else { - ::rtl::OUString aSourcePath( rPaths[0] ); + OUString aSourcePath( rPaths[0] ); if ( rPaths[0].lastIndexOf( '/' ) != rPaths[0].getLength() -1 ) - aSourcePath = rPaths[0] + ::rtl::OUString("/" ); + aSourcePath = rPaths[0] + OUString("/" ); for ( sal_Int32 i = 1; i < rPaths.getLength(); ++i ) { - ::rtl::OUString aPath = aSourcePath + rPaths[i]; + OUString aPath = aSourcePath + rPaths[i]; if ( m_xImportedImageManager->hasImage( GetImageType(), aPath ) ) { aIndex = rPaths[i].lastIndexOf( '/' ); @@ -5467,7 +5466,7 @@ void SvxIconSelectorDialog::ImportGraphics( OUString newLine("\n"); OUString fPath; if (rejectedCount > 1) - fPath = rPaths[0].copy(8) + ::rtl::OUString("/" ); + fPath = rPaths[0].copy(8) + OUString("/" ); for ( sal_Int32 i = 0; i < rejectedCount; ++i ) { message += fPath + rejected[i]; @@ -5487,7 +5486,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) ++m_nNextId; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); uno::Reference< graphic::XGraphic > xGraphic; com::sun::star::awt::Size aSize; @@ -5563,7 +5562,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) * *******************************************************************************/ SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const rtl::OUString& aMessage, bool /*bYestoAll*/ ) + Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) : MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) ) @@ -5578,7 +5577,7 @@ MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) } SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const rtl::OUString& aMessage ) + Window *pWindow, const OUString& aMessage ) : MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) ) { @@ -5586,11 +5585,11 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CON SetMessText( ReplaceIconName( aMessage )); } -rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage ) +OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage ) { - rtl::OUString name; - rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ); - rtl::OUString placeholder("%ICONNAME" ); + OUString name; + OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ); + OUString placeholder("%ICONNAME" ); sal_Int32 pos = message.indexOf( placeholder ); if ( pos != -1 ) { @@ -5611,7 +5610,7 @@ sal_uInt16 SvxIconReplacementDialog :: ShowDialog() * *******************************************************************************/ SvxIconChangeDialog::SvxIconChangeDialog( - Window *pWindow, const rtl::OUString& aMessage) + Window *pWindow, const OUString& aMessage) : ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ), aFImageInfo (this, CUI_RES( FI_INFO ) ), diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 742382d4587c..2fce78c05b1e 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -902,7 +902,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() } Any value = - xPropSet->getPropertyValue( rtl::OUString("URI") ); + xPropSet->getPropertyValue( OUString("URI") ); value >>= uri; String* pScriptURI = new String( uri ); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index fa994c25cad6..54c8f847995d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -51,7 +51,6 @@ #include "cfg.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; // ----------------------------------------------------------------------- diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 37a99380354d..2c8f59dbc1c2 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -48,15 +48,15 @@ private: CancelButton maCancelButton; HelpButton maHelpButton; - ::rtl::OUString maURL; + OUString maURL; DECL_LINK(ButtonHandler, void *); public: - AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL ); + AssignComponentDialog( Window * pParent, const OUString& rURL ); ~AssignComponentDialog(); - ::rtl::OUString getURL( void ) const + OUString getURL( void ) const { return maURL; } }; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 49e02e527475..9a8e5d026847 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -54,7 +54,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/UICommandDescription.hpp> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 54a5c1ac78fe..72910c0135fd 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -35,29 +35,29 @@ namespace svx{ struct SpellErrorDescription { bool bIsGrammarError; - ::rtl::OUString sErrorText; - ::rtl::OUString sDialogTitle; - ::rtl::OUString sExplanation; - ::rtl::OUString sExplanationURL; + OUString sErrorText; + OUString sDialogTitle; + OUString sExplanation; + OUString sExplanationURL; ::com::sun::star::lang::Locale aLocale; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > xGrammarChecker; - ::rtl::OUString sServiceName; ///< service name of GrammarChecker/SpellChecker - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSuggestions; - ::rtl::OUString sRuleId; + OUString sServiceName; ///< service name of GrammarChecker/SpellChecker + ::com::sun::star::uno::Sequence< OUString > aSuggestions; + OUString sRuleId; SpellErrorDescription() : bIsGrammarError( false ){} SpellErrorDescription( bool bGrammar, - const ::rtl::OUString& rText, + const OUString& rText, const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& rSuggestions, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > rxGrammarChecker, - const ::rtl::OUString& rServiceName, - const ::rtl::OUString* pDialogTitle = 0, - const ::rtl::OUString* pExplanation = 0, - const ::rtl::OUString* pRuleId = 0, - const ::rtl::OUString* pExplanationURL = 0 ) : + const OUString& rServiceName, + const OUString* pDialogTitle = 0, + const OUString* pExplanation = 0, + const OUString* pRuleId = 0, + const OUString* pExplanationURL = 0 ) : bIsGrammarError( bGrammar ), sErrorText( rText ), sDialogTitle( ), diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 9e4afeb144ff..f4238c789011 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -using ::rtl::OUString; // struct SpellDialog_Impl --------------------------------------------- @@ -99,10 +98,10 @@ class SpellUndoAction_Impl : public SfxUndoAction long m_nOldErrorStart; long m_nOldErrorEnd; bool m_bIsErrorLanguageSelected; - ::rtl::OUString m_sRuleId; + OUString m_sRuleId; //undo of AddToDictionary Reference<XDictionary> m_xDictionary; - ::rtl::OUString m_sAddedWord; + OUString m_sAddedWord; //move end of error - ::ChangeMarkedWord() long m_nOffset; @@ -148,14 +147,14 @@ public: void SetDictionary(Reference<XDictionary> xDict) { m_xDictionary = xDict; } Reference<XDictionary> GetDictionary() const {return m_xDictionary;} - void SetAddedWord(const ::rtl::OUString& rWord) {m_sAddedWord = rWord;} - const ::rtl::OUString& GetAddedWord() const { return m_sAddedWord;} + void SetAddedWord(const OUString& rWord) {m_sAddedWord = rWord;} + const OUString& GetAddedWord() const { return m_sAddedWord;} void SetOffset(long nSet) {m_nOffset = nSet;} long GetOffset() const {return m_nOffset;} - void SetErrorType( const ::rtl::OUString& rId ) { m_sRuleId = rId; } - const ::rtl::OUString& GetErrorType() const { return m_sRuleId; } + void SetErrorType( const OUString& rId ) { m_sRuleId = rId; } + const OUString& GetErrorType() const { return m_sRuleId; } }; }//namespace svx @@ -301,7 +300,7 @@ void SpellDialog::UpdateBoxes_Impl() const SpellErrorDescription* pSpellErrorDescription = m_pSentenceED->GetAlternatives(); LanguageType nAltLanguage = LANGUAGE_NONE; - Sequence< ::rtl::OUString > aNewWords; + Sequence< OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { @@ -324,7 +323,7 @@ void SpellDialog::UpdateBoxes_Impl() int nDicts = InitUserDicts(); // enter alternatives - const ::rtl::OUString *pNewWords = aNewWords.getConstArray(); + const OUString *pNewWords = aNewWords.getConstArray(); const sal_Int32 nSize = aNewWords.getLength(); for ( i = 0; i < nSize; ++i ) { @@ -627,7 +626,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) String sErrorText(m_pSentenceED->GetErrorText()); sal_uInt8 nAdded = linguistic::AddEntryToDic( aXDictionary, sErrorText, sal_False, - ::rtl::OUString(), LANGUAGE_NONE ); + OUString(), LANGUAGE_NONE ); if(nAdded == DIC_ERR_NONE) { SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( @@ -797,10 +796,10 @@ void SpellDialog::SetLanguage( sal_uInt16 nLang ) m_pLanguageLB->SelectLanguage( nLang ); } -static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) +static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - ::rtl::OUString aTmp; + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); @@ -1079,7 +1078,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(!aSentence.empty()) { SpellPortions::iterator aStart = aSentence.begin(); - rtl::OUString sText; + OUString sText; while(aStart != aSentence.end()) { // hidden text has to be ignored @@ -1101,7 +1100,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(aStart->xAlternatives.is()) { uno::Reference< container::XNamed > xNamed( aStart->xAlternatives, uno::UNO_QUERY ); - ::rtl::OUString sServiceName; + OUString sServiceName; if( xNamed.is() ) sServiceName = xNamed->getName(); SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), @@ -1111,7 +1110,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) else if(aStart->bIsGrammarError ) { beans::PropertyValues aProperties = aStart->aGrammarError.aProperties; - rtl::OUString sFullCommentURL; + OUString sFullCommentURL; sal_Int32 i = 0; while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() ) { @@ -1169,7 +1168,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe { if(aStart->xAlternatives.is()) { - const rtl::OUString &rString = aStart->sText; + const OUString &rString = aStart->sText; Reference<XDictionaryEntry> xEntry = xChangeAll->getEntry(rString); @@ -1750,10 +1749,10 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA DBG_ASSERT(static_cast<const SpellErrorAttrib*>( GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); - ::rtl::OUString aWord; + OUString aWord; lang::Locale aLocale; - uno::Sequence< ::rtl::OUString > aAlts; - ::rtl::OUString sServiceName; + uno::Sequence< OUString > aAlts; + OUString sServiceName; if (xAlt.is()) { aWord = xAlt->getWord(); @@ -2026,8 +2025,8 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { - rtl::OUString sURL=pHyperlink->GetURL(); - rtl::OUString sTitle=GetText(); + OUString sURL=pHyperlink->GetURL(); + OUString sTitle=GetText(); if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; @@ -2035,12 +2034,12 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { uno::Any exc( ::cppu::getCaughtException() ); - rtl::OUString msg( ::comphelper::anyToString( exc ) ); + OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); aErrorBox.SetText( sTitle ); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0fcb96b31a5b..ee943f8f4092 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -98,7 +98,7 @@ AboutDialog::AboutDialog(Window* pParent) IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { - rtl::OUString sURL = ""; + OUString sURL = ""; // Find which button was pressed and from this, get the URL to be opened AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData(); @@ -117,12 +117,12 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) ); - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch (const Exception&) { Any exc( ::cppu::getCaughtException() ); - rtl::OUString msg( ::comphelper::anyToString( exc ) ); + OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); aErrorBox.SetText( GetText() ); @@ -249,9 +249,9 @@ OUString AboutDialog::GetVersionString() return sVersion; } -rtl::OUString AboutDialog::GetCopyrightString() +OUString AboutDialog::GetCopyrightString() { - rtl::OUString aCopyrightString = m_aVendorTextStr; + OUString aCopyrightString = m_aVendorTextStr; aCopyrightString += "\n"; aCopyrightString += m_aCopyrightTextStr; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index c9a2c0926345..c0f0831c1bc8 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -45,7 +45,6 @@ #include <cmath> #include <limits> -using rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -162,7 +161,7 @@ HexColorControl::HexColorControl( Window* pParent, const ResId& rResId ) void HexColorControl::SetColor( sal_Int32 nColor ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sax::Converter::convertColor( aBuffer, nColor ); SetText( aBuffer.makeStringAndClear().copy(1) ); } @@ -233,7 +232,7 @@ void HexColorControl::Paste() try { ::com::sun::star::uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; if( !aText.isEmpty() && aText.matchAsciiL( "#", 1, 0 ) ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 0b06b97292e9..05559422f7dd 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -292,7 +292,7 @@ void SvxCharacterMap::init() m_pDeleteBtn->Hide(); } - rtl::OUString aDefStr( aFont.GetName() ); + OUString aDefStr( aFont.GetName() ); String aLastName; int nCount = GetDevFontCount(); for ( int i = 0; i < nCount; i++ ) @@ -314,7 +314,7 @@ void SvxCharacterMap::init() sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aDefStr.getToken(0, ';', nIndex); + OUString aToken = aDefStr.getToken(0, ';', nIndex); if ( m_pFontLB->GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND ) { aDefStr = aToken; @@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) { sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); // using the new UCS4 constructor - rtl::OUString aOUStr( &cChar, 1 ); + OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aOUStr ); } EndDialog( sal_True ); @@ -484,7 +484,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) { sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); // using the new UCS4 constructor - rtl::OUString aOUStr( &cChar, 1 ); + OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aText + aOUStr ); } @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) if ( bSelect ) { // using the new UCS4 constructor - aText = rtl::OUString( &cChar, 1 ); + aText = OUString( &cChar, 1 ); const Subset* pSubset = NULL; if( pSubsetMap ) @@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) ); if( cChar < 0x0100 ) snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) ); - aText = rtl::OUString::createFromAscii(aBuf); + aText = OUString::createFromAscii(aBuf); } m_pCharCodeText->SetText( aText ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 20496cd892e1..a386b9ccaf96 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -814,8 +814,8 @@ void FmSearchDialog::LoadParams() { FmSearchParams aParams(m_pConfig->getParams()); - const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); - const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); + const OUString* pHistory = aParams.aHistory.getConstArray(); + const OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); for (; pHistory != pHistoryEnd; ++pHistory) m_cmbSearchText.InsertEntry( *pHistory ); @@ -910,7 +910,7 @@ void FmSearchDialog::SaveParams() const FmSearchParams aCurrentSettings; aCurrentSettings.aHistory.realloc( m_cmbSearchText.GetEntryCount() ); - ::rtl::OUString* pHistory = aCurrentSettings.aHistory.getArray(); + OUString* pHistory = aCurrentSettings.aHistory.getArray(); for (sal_uInt16 i=0; i<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory) *pHistory = m_cmbSearchText.GetEntry(i); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index eec7c36c2d3f..ce6581001dce 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -822,12 +822,12 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& // ------------------------------------------------------------------------ -::rtl::OUString TPGalleryThemeProperties::addExtension( const ::rtl::OUString& _rDisplayText, const ::rtl::OUString& _rExtension ) +OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension ) { - ::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) ); - ::rtl::OUString sOpenBracket( " (" ); - ::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) ); - ::rtl::OUString sRet = _rDisplayText; + OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) ); + OUString sOpenBracket( " (" ); + OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) ); + OUString sRet = _rDisplayText; if ( sRet.indexOf( sAllFilter ) == -1 ) { @@ -901,7 +901,7 @@ void TPGalleryThemeProperties::FillFilterList() } // media filters - static const ::rtl::OUString aWildcard( "*." ); + static const OUString aWildcard( "*." ); ::avmedia::FilterNameVector aFilters; ::avmedia::MediaWindow::getMediaFilters( aFilters ); @@ -909,7 +909,7 @@ void TPGalleryThemeProperties::FillFilterList() { for( sal_Int32 nIndex = 0; nIndex >= 0; ) { - ::rtl::OUString aFilterWildcard( aWildcard ); + OUString aFilterWildcard( aWildcard ); pFilterEntry = new FilterEntry; pFilterEntry->aFilterName = aFilters[ l ].second.getToken( 0, ';', nIndex ); @@ -1008,7 +1008,7 @@ void TPGalleryThemeProperties::SearchFiles() aLbxFound.Clear(); pProgress->SetFileType( aCbbFileType.GetText() ); - pProgress->SetDirectory( rtl::OUString() ); + pProgress->SetDirectory( OUString() ); pProgress->Update(); pProgress->StartExecuteModal( LINK( this, TPGalleryThemeProperties, EndSearchProgressHdl ) ); diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 711a7b4f6fcf..ceb24716263a 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -77,7 +77,7 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT maCbbTargets.InsertEntry( *rTargetList[ i ] ); if( !rTarget.Len() ) - maCbbTargets.SetText( rtl::OUString("_self") ); + maCbbTargets.SetText( OUString("_self") ); else maCbbTargets.SetText( rTarget ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 87e4b163945e..ebf3a471a2e2 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -52,7 +52,6 @@ namespace svx using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - using ::rtl::OUString; //------------------------------------------------------------------------- namespace @@ -614,12 +613,12 @@ namespace svx } //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ) + void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) { m_aSuggestions.Clear(); - const ::rtl::OUString* pSuggestions = _rSuggestions.getConstArray(); - const ::rtl::OUString* pSuggestionsEnd = _rSuggestions.getConstArray() + _rSuggestions.getLength(); + const OUString* pSuggestions = _rSuggestions.getConstArray(); + const OUString* pSuggestionsEnd = _rSuggestions.getConstArray() + _rSuggestions.getLength(); while ( pSuggestions != pSuggestionsEnd ) m_aSuggestions.InsertEntry( *pSuggestions++ ); @@ -779,7 +778,7 @@ namespace svx //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetCurrentString( const String& _rNewString, - const Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument ) + const Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { m_pPlayground->SetCurrentText( _rNewString ); @@ -941,9 +940,9 @@ namespace svx Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); + Sequence< OUString > aDictNames( xNameAccess->getElementNames() ); - const ::rtl::OUString* pDic = aDictNames.getConstArray(); + const OUString* pDic = aDictNames.getConstArray(); sal_Int32 nCount = aDictNames.getLength(); sal_Int32 i; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 203257707898..1a55181f6434 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -167,7 +167,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () { uno::Sequence< beans::PropertyValue >& rDynamicMenuEntry = aDynamicMenuEntries[ i ]; - rtl::OUString aDocumentUrl, aTitle, aImageId, aTargetName; + OUString aDocumentUrl, aTitle, aImageId, aTargetName; for ( int e = 0; e < rDynamicMenuEntry.getLength(); e++ ) { @@ -338,13 +338,13 @@ void SvxHyperlinkNewDocTp::DoApply () // create items SfxStringItem aName( SID_FILE_NAME, aStrDocName ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); - SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aReferer( SID_REFERER, OUString("private:user") ); + SfxStringItem aFrame( SID_TARGETNAME, OUString("_blank") ); - rtl::OUString aStrFlags('S'); + OUString aStrFlags('S'); if ( maRbtEditLater.IsChecked() ) { - aStrFlags += rtl::OUString('H'); + aStrFlags += OUString('H'); } SfxStringItem aFlags (SID_OPTIONS, aStrFlags); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index b270153d320f..e0866fc67165 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -142,9 +142,9 @@ void SvxHyperlinkInternetTp::FillDlgFields ( String& aStrURL ) void SvxHyperlinkInternetTp::setAnonymousFTPUser() { - maEdLogin.SetText(rtl::OUString(sAnonymous)); + maEdLogin.SetText(OUString(sAnonymous)); SvAddressParser aAddress( SvtUserOptions().GetEmail() ); - maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : rtl::OUString() ); + maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : OUString() ); maFtLogin.Disable (); maFtPassword.Disable (); @@ -336,8 +336,8 @@ void SvxHyperlinkInternetTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkInternetTp::GetSchemeFromButtons() const { if( maRbtLinktypFTP.IsChecked() ) - return rtl::OUString(INET_FTP_SCHEME); - return rtl::OUString(INET_HTTP_SCHEME); + return OUString(INET_FTP_SCHEME); + return OUString(INET_HTTP_SCHEME); } INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const @@ -415,8 +415,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) ///////////////////////////////////////////////// // Open URL if available - SfxStringItem aName( SID_FILE_NAME, rtl::OUString("http://") ); - SfxStringItem aRefererItem( SID_REFERER, rtl::OUString("private:user") ); + SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); + SfxStringItem aRefererItem( SID_REFERER, OUString("private:user") ); SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); SfxBoolItem aSilent( SID_SILENT, sal_True ); SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 1899ed9c895b..1a5090cf570d 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -161,7 +161,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const { if ( maEdSubject.GetText() != OUString(aEmptyStr) ) { - String aQuery = rtl::OUString("subject="); + String aQuery = OUString("subject="); aQuery.Append( maEdSubject.GetText() ); aURL.SetParam(aQuery); } @@ -241,8 +241,8 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkMailTp::GetSchemeFromButtons() const { if( maRbtNews.IsChecked() ) - return rtl::OUString(INET_NEWS_SCHEME); - return rtl::OUString(INET_MAILTO_SCHEME); + return OUString(INET_NEWS_SCHEME); + return OUString(INET_MAILTO_SCHEME); } INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 782743d6aaaa..343eb9cbbbe1 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -217,7 +217,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL ) xub_StrLen nPos = aStrURL.Search ( sal_Unicode('#') ); if( nPos != 0 ) - aUStrURL = ::rtl::OUString( aStrURL ); + aUStrURL = OUString( aStrURL ); if( !RefreshFromDoc ( aUStrURL ) ) maLbTree.Invalidate(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 9df36a8892ff..273d89e027bf 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -433,23 +433,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL ) { if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) ) { - aStrScheme = rtl::OUString( INET_HTTP_SCHEME ); + aStrScheme = OUString( INET_HTTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) ) { - aStrScheme = rtl::OUString( INET_HTTPS_SCHEME ); + aStrScheme = OUString( INET_HTTPS_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) ) { - aStrScheme = rtl::OUString( INET_FTP_SCHEME ); + aStrScheme = OUString( INET_FTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) ) { - aStrScheme = rtl::OUString( INET_MAILTO_SCHEME ); + aStrScheme = OUString( INET_MAILTO_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) ) { - aStrScheme = rtl::OUString( INET_NEWS_SCHEME ); + aStrScheme = OUString( INET_NEWS_SCHEME ); } } else diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6c24c0c7ec69..1f853ff62483 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -36,17 +36,17 @@ using ::std::vector; // some stuff for easier changes for SvtViewOptions static const sal_Char* pViewOptDataName = "dialog data"; -#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) +#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName ) static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { - rOpt.SetUserItem( VIEWOPT_DATANAME, ::com::sun::star::uno::makeAny( ::rtl::OUString( rData ) ) ); + rOpt.SetUserItem( VIEWOPT_DATANAME, ::com::sun::star::uno::makeAny( OUString( rData ) ) ); } static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) { ::com::sun::star::uno::Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) ); - ::rtl::OUString aUserData; + OUString aUserData; aAny >>= aUserData; return String( aUserData ); @@ -254,7 +254,7 @@ IconChoiceDialog ::~IconChoiceDialog () // save configuration at INI-Manager // and remove pages SvtViewOptions aTabDlgOpt( E_TABDIALOG, OUString::number(nResId) ); - aTabDlgOpt.SetWindowState(::rtl::OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); + aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); aTabDlgOpt.SetPageID( mnCurrentPageId ); for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) @@ -1002,7 +1002,7 @@ void IconChoiceDialog::Start_Impl() if ( aTabDlgOpt.Exists() ) { // possibly position from config - SetWindowState(rtl::OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + SetWindowState(OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from program/help/config nActPage = (sal_uInt16)aTabDlgOpt.GetPageID(); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 8d2091d3fa03..80c91331f4f9 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -277,7 +277,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created from file // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName ); + aErr.SearchAndReplace( OUString( '%' ), aFileName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } else @@ -285,7 +285,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aServerName ); + aErr.SearchAndReplace( OUString( '%' ), aServerName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } @@ -326,7 +326,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created from file // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName ); + aErr.SearchAndReplace( OUString( '%' ), aFileName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } @@ -477,7 +477,7 @@ short SvInsertPlugInDialog::Execute() // PlugIn couldn't be created // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_PLUGIN ) ); - aErr.SearchAndReplace( rtl::OUString('%'), aURL ); + aErr.SearchAndReplace( OUString('%'), aURL ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 7efbc486fe80..cf6319cc1cfe 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -32,7 +32,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const OString& sHelpId ) : ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui") , aRow(CUI_RESSTR(RID_SVXSTR_ROW)) , aCol(CUI_RESSTR(RID_SVXSTR_COL)) diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 74f836117c12..cbd785e3f7cd 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -51,7 +51,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) if ( IsClassPathMode() ) { aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), OUString("*.jar;*.zip") ); } if ( aDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 3dad7487d74a..33715595cf82 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -96,7 +96,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) sal_uLong nPos = aRadioLB.GetEntryPos( sInsPath, 1 ); if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos { - rtl::OUString sNewEntry( '\t' ); + OUString sNewEntry( '\t' ); sNewEntry += sInsPath; SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sNewEntry ); String* pData = new String( aURL ); @@ -284,7 +284,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) if ( pImpl->bIsRadioButtonMode ) { - rtl::OUString sEntry( '\t' ); + OUString sEntry( '\t' ); sEntry += (bIsSystemPath ? sSystemPath : OUString(sPath)); SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sEntry ); String* pURL = new String( sPath ); diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 1597e2bf2826..427c42b5ddb9 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -47,7 +47,7 @@ typedef map< String, StrSet, ltstr > FilterMap; //================================================================================================== -void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequence< rtl::OUString >& rPluginTypes ) +void fillNetscapePluginFilters( Sequence< OUString >& rPluginNames, Sequence< OUString >& rPluginTypes ) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference< XPluginManager > xPMgr( PluginManager::create(xContext) ); @@ -74,10 +74,10 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc } } - rPluginNames = Sequence< rtl::OUString >( aMap.size() ); - rPluginTypes = Sequence< rtl::OUString >( aMap.size() ); - rtl::OUString* pPluginNames = rPluginNames.getArray(); - rtl::OUString* pPluginTypes = rPluginTypes.getArray(); + rPluginNames = Sequence< OUString >( aMap.size() ); + rPluginTypes = Sequence< OUString >( aMap.size() ); + OUString* pPluginNames = rPluginNames.getArray(); + OUString* pPluginTypes = rPluginTypes.getArray(); int nIndex = 0; for ( FilterMap::iterator iPos = aMap.begin(); iPos != aMap.end(); ++iPos ) { @@ -95,7 +95,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc if ( aType.Len() ) { - aText += rtl::OUString( " (" ); + aText += OUString( " (" ); aText += aType; aText += ')'; pPluginNames[nIndex] = aText; diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 4e2465ec2239..a459ec725c91 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -101,7 +101,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ); - rtl::OUString aTextStr; + OUString aTextStr; if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { const SvxPostItTextItem& rText = diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 3ce21e70739b..bb105fa6abeb 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -106,7 +106,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); bIsHidden = ::comphelper::getBOOL(aHidden); - ::rtl::OUString sName; + OUString sName; xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; sCurName = sName; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 56b0185a4b8d..713bbae4d673 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -53,7 +53,6 @@ #include <com/sun/star/linguistic2/LinguServiceManager.hpp> using namespace ::com::sun::star; -using ::rtl::OUString; // class LookUpComboBox -------------------------------------------------- @@ -533,7 +532,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) // adjust language String aStr( GetText() ); aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 ); - aStr.Append( rtl::OUString(" (") ); + aStr.Append( OUString(" (") ); aStr += SvtLanguageTable().GetLanguageString( nLanguage ); aStr.Append( sal_Unicode( ')' ) ); SetText( aStr ); // set window title diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index e0dbad90ebca..2e06c45d6379 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -43,7 +43,6 @@ #include <algorithm> using namespace ::com::sun::star; -using ::rtl::OUString; class SvTreeListEntry; class ThesaurusAlternativesCtrl; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 52bb6df63317..041557df8f5c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -326,7 +326,7 @@ editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversio void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { @@ -391,7 +391,7 @@ sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew() return pDlg->IsCreateNew(); } -::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ) +::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString* pGraphicMediaType ) { return pDlg->GetIconIfIconified( pGraphicMediaType ); } @@ -729,11 +729,11 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId) { pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const OString& aHelpId ) { pDlg->SetHelpId( aHelpId ); } @@ -847,7 +847,7 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const OString& aHelpId ) { pDlg->SetHelpId( aHelpId ); } @@ -1858,7 +1858,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { @@ -1872,20 +1872,20 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia if ( pDlg ) { - pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); - pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return new CuiVclAbstractDialog_Impl( pDlg ); } return 0; @@ -1922,12 +1922,12 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( } VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( - Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ ) + Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) { return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) { return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 369e487946bb..cf29bdf3cac0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -388,9 +388,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(const rtl::OString&) ; + virtual void SetEditHelpId(const OString&) ; //from class Window - virtual void SetHelpId( const rtl::OString& ) ; + virtual void SetHelpId( const OString& ) ; virtual void SetText( const OUString& rStr ) ; private: Link aCheckNameHdl; @@ -460,7 +460,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( const rtl::OString& ) ; + virtual void SetHelpId( const OString& ) ; }; //for SvxMultiFileDialog end @@ -777,9 +777,9 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const rtl::OUString& rApplicationContext ); + Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 87427302a84a..19eba293bef4 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -98,7 +98,7 @@ struct TAccInfo sal_Int32 m_nKeyPos; sal_Int32 m_nListPos; sal_Bool m_bIsConfigurable; - ::rtl::OUString m_sCommand; + OUString m_sCommand; KeyCode m_aKey; }; @@ -146,9 +146,9 @@ private: css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription; css::uno::Reference< css::frame::XFrame > m_xFrame; - ::rtl::OUString m_sModuleLongName; - ::rtl::OUString m_sModuleShortName; - ::rtl::OUString m_sModuleUIName; + OUString m_sModuleLongName; + OUString m_sModuleShortName; + OUString m_sModuleUIName; DECL_LINK(ChangeHdl, void *); DECL_LINK(RemoveHdl, void *); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index abaf70c7f121..1190ffe6aa1e 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -248,7 +248,7 @@ private: String sModify; String sNew; - std::set<rtl::OUString> aFormatText; + std::set<OUString> aFormatText; DoubleStringTable aDoubleStringTable; CollatorWrapper* pCompareClass; CharClass* pCharClass; @@ -287,8 +287,8 @@ public: struct StringsArrays { - std::vector<rtl::OUString> aAbbrevStrings; - std::vector<rtl::OUString> aDoubleCapsStrings; + std::vector<OUString> aAbbrevStrings; + std::vector<OUString> aDoubleCapsStrings; StringsArrays() { } }; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 790dcd654cb6..84ecf045156b 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -100,7 +100,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >& xCfgMgr, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >& xParentCfgMgr, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~SaveInData() {} @@ -137,9 +137,9 @@ public: com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > m_aSeparatorSeq; - Image GetImage( const rtl::OUString& rCommandURL ); + Image GetImage( const OUString& rCommandURL ); - virtual bool HasURL( const rtl::OUString& aURL ) = 0; + virtual bool HasURL( const OUString& aURL ) = 0; virtual bool HasSettings() = 0; virtual SvxEntries* GetEntries() = 0; virtual void SetEntries( SvxEntries* ) = 0; @@ -151,8 +151,8 @@ class MenuSaveInData : public SaveInData { private: - rtl::OUString m_aMenuResourceURL; - rtl::OUString m_aDescriptorContainer; + OUString m_aMenuResourceURL; + OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess > m_xMenuSettings; @@ -185,7 +185,7 @@ private: bool LoadSubMenus( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, - const rtl::OUString& rBaseTitle, SvxConfigEntry* pParentData ); + const OUString& rBaseTitle, SvxConfigEntry* pParentData ); public: @@ -194,7 +194,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~MenuSaveInData(); @@ -202,7 +202,7 @@ public: /// methods inherited from SaveInData SvxEntries* GetEntries(); void SetEntries( SvxEntries* ); - bool HasURL( const rtl::OUString& URL ) { (void)URL; return sal_False; } + bool HasURL( const OUString& URL ) { (void)URL; return sal_False; } bool HasSettings() { return m_xMenuSettings.is(); } void Reset(); bool Apply(); @@ -214,10 +214,10 @@ private: /// common properties sal_uInt16 nId; - ::rtl::OUString aHelpText; - ::rtl::OUString aLabel; - ::rtl::OUString aCommand; - ::rtl::OUString aHelpURL; + OUString aHelpText; + OUString aLabel; + OUString aCommand; + OUString aHelpURL; bool bPopUp; bool bStrEdited; @@ -236,8 +236,8 @@ private: public: - SvxConfigEntry( const ::rtl::OUString& rDisplayName, - const ::rtl::OUString& rCommandURL, + SvxConfigEntry( const OUString& rDisplayName, + const OUString& rCommandURL, bool bPopup = sal_False, bool bParentData = sal_False ); @@ -256,17 +256,17 @@ public: ~SvxConfigEntry(); - const ::rtl::OUString& GetCommand() const { return aCommand; } + const OUString& GetCommand() const { return aCommand; } void SetCommand( const String& rCmd ) { aCommand = rCmd; } - const ::rtl::OUString& GetName() const { return aLabel; } + const OUString& GetName() const { return aLabel; } void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; } bool HasChangedName() const { return bStrEdited; } - const ::rtl::OUString& GetHelpText() ; + const OUString& GetHelpText() ; void SetHelpText( const String& rStr ) { aHelpText = rStr; } - const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } + const OUString& GetHelpURL() const { return aHelpURL; } void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } void SetPopup( bool bOn = sal_True ) { bPopUp = bOn; } @@ -398,7 +398,7 @@ protected: SvxScriptSelectorDialog* pSelectorDlg; /// the ResourceURL to select when opening the dialog - rtl::OUString m_aURLToSelect; + OUString m_aURLToSelect; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -413,7 +413,7 @@ protected: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ) = 0; virtual void Init() = 0; @@ -439,7 +439,7 @@ protected: public: - static bool CanConfig( const ::rtl::OUString& rModuleId ); + static bool CanConfig( const OUString& rModuleId ); SaveInData* GetSaveInData() { return pCurrentSaveInData; } @@ -474,7 +474,7 @@ public: If the given frame is not <NULL/>, or an default frame could be successfully determined, then the ModuleManager is asked for the module ID of the component in the frame. */ - static ::rtl::OUString + static OUString GetFrameWithDefaultAndIdentify( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _inout_rxFrame ); }; @@ -505,7 +505,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); }; @@ -618,7 +618,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); }; @@ -627,7 +627,7 @@ class ToolbarSaveInData : public SaveInData private: SvxConfigEntry* pRootEntry; - rtl::OUString m_aDescriptorContainer; + OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess > m_xPersistentWindowState; @@ -651,7 +651,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~ToolbarSaveInData(); @@ -661,22 +661,22 @@ public: void RemoveToolbar( SvxConfigEntry* pToolbar ); void ApplyToolbar( SvxConfigEntry* pToolbar ); - rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); + OUString GetSystemUIName( const OUString& rResourceURL ); - sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); + sal_Int32 GetSystemStyle( const OUString& rResourceURL ); void SetSystemStyle( - const rtl::OUString& rResourceURL, sal_Int32 nStyle ); + const OUString& rResourceURL, sal_Int32 nStyle ); void SetSystemStyle( ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame, - const rtl::OUString& rResourceURL, sal_Int32 nStyle ); + const OUString& rResourceURL, sal_Int32 nStyle ); SvxEntries* GetEntries(); void SetEntries( SvxEntries* ); bool HasSettings(); - bool HasURL( const rtl::OUString& rURL ); + bool HasURL( const OUString& rURL ); void Reset(); bool Apply(); }; @@ -708,7 +708,7 @@ public: m_pBtnOK->Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId( const rtl::OString& aHelpId) + void SetEditHelpId( const OString& aHelpId) { m_pEdtName->SetHelpId(aHelpId); } @@ -742,12 +742,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider; - bool ReplaceGraphicItem( const ::rtl::OUString& aURL ); + bool ReplaceGraphicItem( const OUString& aURL ); - bool ImportGraphic( const ::rtl::OUString& aURL ); + bool ImportGraphic( const OUString& aURL ); void ImportGraphics( - const com::sun::star::uno::Sequence< rtl::OUString >& aURLs ); + const com::sun::star::uno::Sequence< OUString >& aURLs ); public: @@ -774,14 +774,14 @@ class SvxIconReplacementDialog : public MessBox public: SvxIconReplacementDialog( Window *pWindow, - const rtl::OUString& aMessage, + const OUString& aMessage, bool aYestoAll); SvxIconReplacementDialog( Window *pWindow, - const rtl::OUString& aMessage ); + const OUString& aMessage ); - rtl::OUString ReplaceIconName( const rtl::OUString& ); + OUString ReplaceIconName( const OUString& ); sal_uInt16 ShowDialog(); }; //added for issue83555 @@ -793,7 +793,7 @@ private: FixedText aDescriptionLabel; SvxDescriptionEdit aLineEditDescription; public: - SvxIconChangeDialog(Window *pWindow, const rtl::OUString& aMessage); + SvxIconChangeDialog(Window *pWindow, const OUString& aMessage); }; #endif // _SVXCFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 3f9492f649be..66ea8dbed5e2 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -38,10 +38,10 @@ class SfxMacroInfoItem; struct SfxStyleInfo_Impl { - ::rtl::OUString sFamily; - ::rtl::OUString sStyle; - ::rtl::OUString sCommand; - ::rtl::OUString sLabel; + OUString sFamily; + OUString sStyle; + OUString sCommand; + OUString sLabel; SfxStyleInfo_Impl() {} @@ -70,9 +70,9 @@ struct SfxStylesInfo_Impl void getLabel4Style(SfxStyleInfo_Impl& aStyle); ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); - ::std::vector< SfxStyleInfo_Impl > getStyles(const ::rtl::OUString& sFamily); + ::std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily); - static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle); + static OUString generateCommand(const OUString& sFamily, const OUString& sStyle); }; #define SFX_CFGGROUP_FUNCTION 1 @@ -133,7 +133,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox SfxGroupInfoArr_Impl aArr; sal_uLong nMode; - ::rtl::OUString m_sModuleLongName; + OUString m_sModuleLongName; css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::container::XNameAccess > m_xGlobalCategoryInfo; @@ -148,7 +148,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, - ::rtl::OUString& docName + OUString& docName ); @@ -156,7 +156,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox void InitBasic(); void InitStyles(); - ::rtl::OUString MapCommand2UIName(const ::rtl::OUString& sCommand); + OUString MapCommand2UIName(const OUString& sCommand); SfxStylesInfo_Impl* pStylesInfo; @@ -174,7 +174,7 @@ public: void Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sModuleLongName); + const OUString& sModuleLongName); void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox ) { pFunctionListBox = pBox; } void Open( SvTreeListEntry*, sal_Bool ); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 71b5542f423c..422ffdff4dfd 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -51,7 +51,7 @@ protected: sal_Bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset); + SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 3f7c9894f65e..3157e98911cc 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -292,7 +292,7 @@ class TPGalleryThemeProperties : public SfxTabPage virtual void Reset( const SfxItemSet& /*rSet*/ ) {} virtual sal_Bool FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; } - ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); + OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); void SearchFiles(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 2afb2e1ccb24..a07ff3aca380 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -138,7 +138,7 @@ private: FixedText aSymbolHeightFT; MetricField aSymbolHeightMF; CheckBox aSymbolRatioCB; - std::vector<rtl::OUString> aGrfNames; + std::vector<OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; sal_Bool bLastWidthModified; Size aSymbolLastSize; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 62e2b936155b..989dbe021585 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -75,7 +75,7 @@ namespace svx @param _sLocation The location of the file. */ - void insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool bReadOnly ); + void insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool bReadOnly ); /** opens the LinkDialog to create a register pair @param _sOldName diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 1408f2b40a01..ffe670d830c8 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -65,7 +65,7 @@ public: pBtnOK->Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId( const rtl::OString& aHelpId) {pEdtName->SetHelpId(aHelpId);} + void SetEditHelpId( const OString& aHelpId) {pEdtName->SetHelpId(aHelpId);} }; /** #i68101# diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index a1acd5053dc3..5927c53106e5 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -156,7 +156,7 @@ namespace svx String GetCurrentString( ) const; void SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); @@ -190,7 +190,7 @@ namespace svx DECL_LINK( ClickByCharacterHdl, CheckBox* ); /// fill the suggestion list box with suggestions for the actual input - void FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ); + void FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ); }; @@ -327,7 +327,7 @@ namespace svx void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); + bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index d9758f43c19c..ec170d3f6550 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -71,7 +71,7 @@ private: sal_uInt16 mnError; protected: - sal_Bool RefreshFromDoc( ::rtl::OUString aURL ); + sal_Bool RefreshFromDoc( OUString aURL ); SvTreeListEntry* FindEntry ( String aStrName ); void ClearTree(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 37fe1e2a7d73..db70d5ccd2d1 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -50,7 +50,7 @@ protected: public: com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() { return m_xObj; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); virtual sal_Bool IsCreateNew() const; }; @@ -89,7 +89,7 @@ public: virtual short Execute(); /// get replacement for the iconified embedded object and the mediatype of the replacement - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); }; class SvInsertPlugInDialog : public InsertObjectDialog_Impl diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 98f393f082fa..3bc0f1eb39b6 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -36,13 +36,13 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog RadioButton* m_pBeforeBtn; RadioButton* m_pAfterBtn; - rtl::OUString aRow; - rtl::OUString aCol; + OUString aRow; + OUString aCol; bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); + SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); virtual short Execute(void); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 561e500297ac..9795290f8c9c 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -33,7 +33,7 @@ #include <boost/unordered_map.hpp> #include <vector> -typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; +typedef ::boost::unordered_map< OUString, ::std::pair< OUString, OUString >, OUStringHash, ::std::equal_to< OUString > > EventsHash; struct EventDisplayName { @@ -75,8 +75,8 @@ protected: _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); void EnableButtons(); - ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); - ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); + ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); + ::std::pair< OUString, OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); public: diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index a8b0dc22b906..63393d1531ff 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -71,10 +71,10 @@ struct SvxNumSettings_Impl { short nNumberType; short nParentNumbering; - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sBulletChar; - rtl::OUString sBulletFont; + OUString sPrefix; + OUString sSuffix; + OUString sBulletChar; + OUString sBulletFont; SvxNumSettings_Impl() : nNumberType(0), nParentNumbering(0) diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index cacf1b56c948..d9ff490f55ab 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -46,8 +46,8 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::OUString , - ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; +typedef ::boost::unordered_map < OUString, OUString , + OUStringHash, ::std::equal_to< OUString > > Selection_hash; class SFEntry; @@ -60,14 +60,14 @@ private: Image m_libImage; Image m_macImage; Image m_docImage; - ::rtl::OUString m_sMyMacros; - ::rtl::OUString m_sProdMacros; + OUString m_sMyMacros; + OUString m_sProdMacros; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, ::rtl::OUString& language ); + getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, OUString& language ); void delUserData( SvTreeListEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); protected: void ExpandTree( SvTreeListEntry* pRootEntry ); @@ -75,7 +75,7 @@ protected: virtual void ExpandedHdl(); virtual long ExpandingHdl(); public: - void Init( const ::rtl::OUString& language ); + void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox(Window* pParent); @@ -89,7 +89,7 @@ public: SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, - ::rtl::OUString factoryURL ); + OUString factoryURL ); SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, @@ -148,7 +148,7 @@ protected: PushButton* m_pRenameButton; PushButton* m_pDelButton; - ::rtl::OUString m_sLanguage; + OUString m_sLanguage; static Selection_hash m_lastSelection; const String m_delErrStr; const String m_delErrTitleStr; @@ -164,7 +164,7 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); + sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); @@ -181,7 +181,7 @@ protected: public: // prob need another arg in the ctor // to specify the language or provider - SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language ); + SvxScriptOrgDialog( Window* pParent, OUString language ); ~SvxScriptOrgDialog(); virtual short Execute(); @@ -192,9 +192,9 @@ class SvxScriptErrorDialog : public VclAbstractDialog { private: - ::rtl::OUString m_sMessage; + OUString m_sMessage; - DECL_LINK( ShowDialog, ::rtl::OUString* ); + DECL_LINK( ShowDialog, OUString* ); public: diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index ce1f607add8c..4c14e9930a1f 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -44,8 +44,8 @@ struct SvxGroupInfo_Impl sal_uInt16 nOrd; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > xBrowseNode; - ::rtl::OUString sURL; - ::rtl::OUString sHelpText; + OUString sURL; + OUString sHelpText; sal_Bool bWasOpened; SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr ) @@ -68,7 +68,7 @@ struct SvxGroupInfo_Impl { } - SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText ) + SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const OUString& _rURL, const OUString& _rHelpText ) :nKind( n ) ,nOrd( nr ) ,xBrowseNode() @@ -86,7 +86,7 @@ class ImageProvider public: virtual ~ImageProvider() {} - virtual Image GetImage( const rtl::OUString& rCommandURL ) = 0; + virtual Image GetImage( const OUString& rCommandURL ) = 0; }; class SvxConfigFunctionListBox : public SvTreeListBox @@ -136,8 +136,8 @@ class SvxConfigGroupListBox : public SvTreeListBox Image m_libImage; Image m_macImage; Image m_docImage; - ::rtl::OUString m_sMyMacros; - ::rtl::OUString m_sProdMacros; + OUString m_sMyMacros; + OUString m_sProdMacros; Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, @@ -146,7 +146,7 @@ class SvxConfigGroupListBox : public SvTreeListBox ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, - ::rtl::OUString& docName + OUString& docName ); private: diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 5ab74b046251..1b1a58688433 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -154,7 +154,7 @@ public: DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); uno::Sequence< uno::Reference< linguistic2::XMeaning > > - queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); + queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); bool UpdateAlternativesBox_Impl(); void LookUp( const String &rText ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 320769407f82..396834566c87 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -33,9 +33,9 @@ CreateTabPage GetSSOCreator( void ); struct OrderedEntry { sal_Int32 m_nIndex; - rtl::OUString m_sId; + OUString m_sId; - OrderedEntry( sal_Int32 nIndex, const rtl::OUString& rId ) : + OrderedEntry( sal_Int32 nIndex, const OUString& rId ) : m_nIndex( nIndex ), m_sId( rId ) {} }; @@ -45,29 +45,29 @@ typedef std::vector< OrderedEntry* > VectorOfOrderedEntries; struct Module { - rtl::OUString m_sName; + OUString m_sName; bool m_bActive; VectorOfOrderedEntries m_aNodeList; - Module( const rtl::OUString& rName ) : m_sName( rName ), m_bActive( false ) {} + Module( const OUString& rName ) : m_sName( rName ), m_bActive( false ) {} }; // struct OptionsLeaf ---------------------------------------------------- struct OptionsLeaf { - rtl::OUString m_sId; - rtl::OUString m_sLabel; - rtl::OUString m_sPageURL; - rtl::OUString m_sEventHdl; - rtl::OUString m_sGroupId; + OUString m_sId; + OUString m_sLabel; + OUString m_sPageURL; + OUString m_sEventHdl; + OUString m_sGroupId; sal_Int32 m_nGroupIndex; - OptionsLeaf( const rtl::OUString& rId, - const rtl::OUString& rLabel, - const rtl::OUString& rPageURL, - const rtl::OUString& rEventHdl, - const rtl::OUString& rGroupId, + OptionsLeaf( const OUString& rId, + const OUString& rLabel, + const OUString& rPageURL, + const OUString& rEventHdl, + const OUString& rGroupId, sal_Int32 nGroupIndex ) : m_sId( rId ), m_sLabel( rLabel ), @@ -84,20 +84,20 @@ typedef ::std::vector< VectorOfLeaves > VectorOfGroupedLeaves; struct OptionsNode { - rtl::OUString m_sId; - rtl::OUString m_sLabel; - rtl::OUString m_sPageURL; + OUString m_sId; + OUString m_sLabel; + OUString m_sPageURL; bool m_bAllModules; - rtl::OUString m_sGroupId; + OUString m_sGroupId; sal_Int32 m_nGroupIndex; VectorOfLeaves m_aLeaves; VectorOfGroupedLeaves m_aGroupedLeaves; - OptionsNode( const rtl::OUString& rId, - const rtl::OUString& rLabel, - const rtl::OUString& rPageURL, + OptionsNode( const OUString& rId, + const OUString& rLabel, + const OUString& rPageURL, bool bAllModules, - const rtl::OUString& rGroupId, + const OUString& rGroupId, sal_Int32 nGroupIndex ) : m_sId( rId ), m_sLabel( rLabel ), @@ -120,8 +120,8 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes; struct LastPageSaver { sal_uInt16 m_nLastPageId; - rtl::OUString m_sLastPageURL_Tools; - rtl::OUString m_sLastPageURL_ExtMgr; + OUString m_sLastPageURL_Tools; + OUString m_sLastPageURL_ExtMgr; LastPageSaver() : m_nLastPageId( USHRT_MAX ) {} }; @@ -179,11 +179,11 @@ private: void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar - void LoadExtensionOptions( const rtl::OUString& rExtensionId ); - rtl::OUString GetModuleIdentifier( const com::sun::star::uno::Reference< + void LoadExtensionOptions( const OUString& rExtensionId ); + OUString GetModuleIdentifier( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); - Module* LoadModule( const rtl::OUString& rModuleIdentifier ); - VectorOfNodes LoadNodes( Module* pModule, const rtl::OUString& rExtensionId ); + Module* LoadModule( const OUString& rModuleIdentifier ); + VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); void InsertNodes( const VectorOfNodes& rNodeList ); virtual void queue_layout(); @@ -204,7 +204,7 @@ public: OfaTreeOptionsDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); - OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ); + OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ); ~OfaTreeOptionsDialog(); OptionsPageInfo* AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ); @@ -262,10 +262,10 @@ namespace com { namespace sun { namespace star { namespace awt { class XContaine class ExtensionsTabPage : public TabPage { private: - rtl::OUString m_sPageURL; + OUString m_sPageURL; com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xPage; - rtl::OUString m_sEventHdl; + OUString m_sEventHdl; com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowEventHandler > m_xEventHdl; com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider > @@ -273,12 +273,12 @@ private: bool m_bIsWindowHidden; void CreateDialogWithHandler(); - sal_Bool DispatchAction( const rtl::OUString& rAction ); + sal_Bool DispatchAction( const OUString& rAction ); public: ExtensionsTabPage( Window* pParent, WinBits nStyle, - const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, + const OUString& rPageURL, const OUString& rEvtHdl, const com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider >& rProvider ); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 37719bc0f95d..3d3cfda365c3 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -66,10 +66,10 @@ CertPathDialog::CertPathDialog( Window* pParent ) : m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs ); - rtl::OUString sProfile(CUI_RESSTR(STR_PROFILE)); - rtl::OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); + OUString sProfile(CUI_RESSTR(STR_PROFILE)); + OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); - rtl::OUStringBuffer sHeader; + OUStringBuffer sHeader; sHeader.append('\t').append(sProfile).append('\t').append(sDirectory); m_aCertPathList.InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT ); m_aCertPathList.SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) ); @@ -98,15 +98,15 @@ CertPathDialog::CertPathDialog( Window* pParent ) : for (sal_Int32 i = 0; i < nProduct; ++i) { - ::rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]); + OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]); if (!profile.isEmpty()) { - ::rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); - rtl::OUStringBuffer sEntry; + OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); + OUStringBuffer sEntry; sEntry.append('\t').appendAscii(productNames[i]).append(':').append(profile).append('\t').append(sProfilePath); SvTreeListEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); - rtl::OUString* pCertPath = new rtl::OUString(sProfilePath); + OUString* pCertPath = new OUString(sProfilePath); pEntry->SetUserData(pCertPath); } } @@ -124,8 +124,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) : try { - rtl::OUString sUserSetCertPath = - officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString()); + OUString sUserSetCertPath = + officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString()); if (!sUserSetCertPath.isEmpty()) AddCertPath(m_sManual, sUserSetCertPath); @@ -137,12 +137,12 @@ CertPathDialog::CertPathDialog( Window* pParent ) : const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER"); if (pEnv) - AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", rtl::OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); + AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); } IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) { - fprintf(stderr, "dir is %s\n", rtl::OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "dir is %s\n", OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr()); try { @@ -162,11 +162,11 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) return 0; } -rtl::OUString CertPathDialog::getDirectory() const +OUString CertPathDialog::getDirectory() const { SvTreeListEntry* pEntry = m_aCertPathList.FirstSelected(); void* pCertPath = pEntry ? pEntry->GetUserData() : NULL; - return pCertPath ? *static_cast<rtl::OUString*>(pCertPath) : rtl::OUString(); + return pCertPath ? *static_cast<OUString*>(pCertPath) : OUString(); } CertPathDialog::~CertPathDialog() @@ -174,7 +174,7 @@ CertPathDialog::~CertPathDialog() SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { - rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData()); + OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData()); delete pCertPath; pEntry = m_aCertPathList.Next( pEntry ); } @@ -209,12 +209,12 @@ void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry ) m_aCertPathList.SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED); } -void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath) +void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath) { SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { - rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData()); + OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData()); //already exists, just select the original one if (pCertPath->equals(rPath)) { @@ -225,10 +225,10 @@ void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUStr pEntry = m_aCertPathList.Next(pEntry); } - rtl::OUStringBuffer sEntry; + OUStringBuffer sEntry; sEntry.append('\t').append(rProfile).append('\t').append(rPath); pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); - rtl::OUString* pCertPath = new rtl::OUString(rPath); + OUString* pCertPath = new OUString(rPath); pEntry->SetUserData(pCertPath); m_aCertPathList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); HandleCheckEntry(pEntry); @@ -240,7 +240,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) { uno::Reference<ui::dialogs::XFolderPicker2> xFolderPicker = ui::dialogs::FolderPicker::create(comphelper::getProcessComponentContext()); - rtl::OUString sURL; + OUString sURL; osl::Security().getHomeDir(sURL); xFolderPicker->setDisplayDirectory(sURL); xFolderPicker->setDescription(m_sAddDialogText); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) if (xFolderPicker->execute() == ui::dialogs::ExecutableDialogResults::OK) { sURL = xFolderPicker->getDirectory(); - rtl::OUString aPath; + OUString aPath; if (osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sURL, aPath)) AddCertPath(m_sManual, aPath); } diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 65d9a77e1fdb..e8585e528785 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -48,20 +48,20 @@ private: OKButton m_aOKBtn; CancelButton m_aCancelBtn; HelpButton m_aHelpBtn; - rtl::OUString m_sAddDialogText; - rtl::OUString m_sManual; + OUString m_sAddDialogText; + OUString m_sManual; DECL_LINK(CheckHdl_Impl, SvxSimpleTable *); DECL_LINK(AddHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); void HandleCheckEntry(SvTreeListEntry* _pEntry); - void AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath); + void AddCertPath(const OUString &rProfile, const OUString &rPath); public: CertPathDialog(Window* pParent); ~CertPathDialog(); - rtl::OUString getDirectory() const; + OUString getDirectory() const; }; #endif diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index a9dcd4aad45e..faac1b594979 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString("Office.Chart") ), + ::utl::ConfigItem( OUString("Office.Chart") ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series"); + maPropertyNames[ 0 ] = OUString("DefaultColor/Series"); } SvxChartOptions::~SvxChartOptions() @@ -201,7 +201,7 @@ sal_Bool SvxChartOptions::RetrieveOptions() { // get sequence containing all properties - uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames(); + uno::Sequence< OUString > aNames = GetPropertyNames(); uno::Sequence< uno::Any > aProperties( aNames.getLength()); aProperties = GetProperties( aNames ); @@ -244,7 +244,7 @@ sal_Bool SvxChartOptions::RetrieveOptions() void SvxChartOptions::Commit() { - uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames(); + uno::Sequence< OUString > aNames = GetPropertyNames(); uno::Sequence< uno::Any > aValues( aNames.getLength()); if( aValues.getLength() >= 1 ) @@ -265,7 +265,7 @@ void SvxChartOptions::Commit() PutProperties( aNames, aValues ); } -void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 1319702a5d46..a8eeed37bd50 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -69,10 +69,10 @@ private: SvxChartColorTable maDefColors; sal_Bool mbIsInitialized; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > maPropertyNames; - inline ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const + inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const { return maPropertyNames; } sal_Bool RetrieveOptions(); @@ -84,7 +84,7 @@ public: void SetDefaultColors( const SvxChartColorTable& aCol ); 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); }; // ==================== diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index cb93a9724147..25d34e63161d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -193,7 +193,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { - ::rtl::OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); + OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); OFileNotation aTransformer( pRegistration->sLocation ); aRegistrations[ sName ] = DatabaseRegistration( aTransformer.get( OFileNotation::N_URL ), pRegistration->bReadOnly ); } @@ -389,7 +389,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) return 0; } // ----------------------------------------------------------------------------- -void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool _bReadOnly ) +void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly ) { String aStr( _sName ); aStr += '\t'; diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index e3a41a85a2fd..77092ace236e 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -56,12 +56,12 @@ namespace svx Reference< XDatabaseContext > xRegistrations( DatabaseContext::create(xContext) ); - Sequence< ::rtl::OUString > aRegistrationNames( xRegistrations->getRegistrationNames() ); - const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray(); - const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); + Sequence< OUString > aRegistrationNames( xRegistrations->getRegistrationNames() ); + const OUString* pRegistrationName = aRegistrationNames.getConstArray(); + const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName ) { - ::rtl::OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) ); + OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) ); aSettings[ *pRegistrationName ] = DatabaseRegistration( sLocation, xRegistrations->isDatabaseRegistrationReadOnly( *pRegistrationName ) ); } @@ -94,8 +94,8 @@ namespace svx ++reg ) { - const ::rtl::OUString sName = reg->first; - const ::rtl::OUString sLocation = reg->second.sLocation; + const OUString sName = reg->first; + const OUString sLocation = reg->second.sLocation; if ( xRegistrations->hasRegisteredDatabase( sName ) ) { @@ -112,9 +112,9 @@ namespace svx } // delete unused entries - Sequence< ::rtl::OUString > aRegistrationNames = xRegistrations->getRegistrationNames(); - const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray(); - const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); + Sequence< OUString > aRegistrationNames = xRegistrations->getRegistrationNames(); + const OUString* pRegistrationName = aRegistrationNames.getConstArray(); + const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName ) { if ( rNewRegistrations.find( *pRegistrationName ) == rNewRegistrations.end() ) diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 22411085f19f..692d75f5e378 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -30,7 +30,7 @@ namespace svx struct DatabaseRegistration { - ::rtl::OUString sLocation; + OUString sLocation; bool bReadOnly; DatabaseRegistration() @@ -39,7 +39,7 @@ namespace svx { } - DatabaseRegistration( const ::rtl::OUString& _rLocation, const sal_Bool _bReadOnly ) + DatabaseRegistration( const OUString& _rLocation, const sal_Bool _bReadOnly ) :sLocation( _rLocation ) ,bReadOnly( _bReadOnly ) { @@ -58,7 +58,7 @@ namespace svx } }; - typedef ::std::map< ::rtl::OUString, DatabaseRegistration, ::comphelper::UStringLess > DatabaseRegistrations; + typedef ::std::map< OUString, DatabaseRegistration, ::comphelper::UStringLess > DatabaseRegistrations; //==================================================================== //= DatabaseMapItem diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index d38b872ab27d..8302799b480a 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -62,7 +62,7 @@ namespace svx FreeResource(); - rtl::OUString sTemp("*.odb"); + OUString sTemp("*.odb"); m_aURL.SetFilter(sTemp); m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) ); @@ -103,7 +103,7 @@ namespace svx IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk) { // get the current URL - ::rtl::OUString sURL = m_aURL.GetText(); + OUString sURL = m_aURL.GetText(); OFileNotation aTransformer(sURL); sURL = aTransformer.get(OFileNotation::N_URL); @@ -162,7 +162,7 @@ namespace svx { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); if ( pFilter ) { aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 0702c99cfe43..ef193e379065 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -182,11 +182,11 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) NonProportionalFontsOnly::set( m_pNonPropFontsOnlyCB->IsChecked(), batch); //font name changes cannot be detected by saved values - rtl::OUString sFontName; + OUString sFontName; if(m_pFontNameLB->GetSelectEntryPos()) sFontName = m_pFontNameLB->GetSelectEntry(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( - boost::optional< rtl::OUString >(sFontName), batch); + boost::optional< OUString >(sFontName), batch); batch->commit(); return sal_False; @@ -224,9 +224,9 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) officecfg::Office::Common::Font::SourceViewFont:: NonProportionalFontsOnly::get()); NonPropFontsHdl(m_pNonPropFontsOnlyCB); - rtl::OUString sFontName( + OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get(). - get_value_or(rtl::OUString())); + get_value_or(OUString())); if(!sFontName.isEmpty()) m_pFontNameLB->SelectEntry(sFontName); else diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 66984ca99375..d035daf373f2 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::i18n; using namespace com::sun::star::frame; using namespace com::sun::star::beans; -using rtl::OUString; const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation"; const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index b0b284068fbe..e359353ece84 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -190,7 +190,7 @@ private: FixedText *m_pText; public: Chapter(FixedText *pText, bool bShow); - Chapter(Window *pGrid, unsigned nYPos, const rtl::OUString& sDisplayName); + Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName); ~Chapter(); public: void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); } @@ -569,7 +569,7 @@ void ColorConfigWindow_Impl::CreateEntries() size_t nLineNum = vChapters.size() + vEntries.size() + 1; for (unsigned j = 0; j != nExtGroupCount; ++j) { - rtl::OUString const sComponentName = aExtConfig.GetComponentName(j); + OUString const sComponentName = aExtConfig.GetComponentName(j); vChapters.push_back(boost::shared_ptr<Chapter>(new Chapter( m_pGrid, nLineNum, aExtConfig.GetComponentDisplayName(sComponentName) @@ -698,7 +698,7 @@ void ColorConfigWindow_Impl::Update ( unsigned const nExtCount = pExtConfig->GetComponentCount(); for (unsigned j = 0; j != nExtCount; ++j) { - rtl::OUString sComponentName = pExtConfig->GetComponentName(j); + OUString sComponentName = pExtConfig->GetComponentName(j); unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName); for (unsigned k = 0; i != vEntries.size() && k != nColorCount; ++i, ++k) vEntries[i]->Update( @@ -757,7 +757,7 @@ void ColorConfigWindow_Impl::ColorHdl ( unsigned const nExtCount = pExtConfig->GetComponentCount(); for (unsigned j = 0; j != nExtCount; ++j) { - rtl::OUString sComponentName = pExtConfig->GetComponentName(j); + OUString sComponentName = pExtConfig->GetComponentName(j); unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName); unsigned const nCount = vEntries.size(); for (unsigned k = 0; i != nCount && k != nColorCount; ++i, ++k) @@ -1056,7 +1056,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() //changes need to be undone if(!bFillItemSetCalled && m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos()) { - rtl::OUString sOldScheme = m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue()); + OUString sOldScheme = m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue()); if(!sOldScheme.isEmpty()) { pColorConfig->SetCurrentSchemeName(sOldScheme); @@ -1115,8 +1115,8 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) //has to be called always to speed up accessibility tools m_pColorConfigCT->SetScrollPosition(sUser.ToInt32()); m_pColorSchemeLB->Clear(); - uno::Sequence< ::rtl::OUString > aSchemes = pColorConfig->GetSchemeNames(); - const rtl::OUString* pSchemes = aSchemes.getConstArray(); + uno::Sequence< OUString > aSchemes = pColorConfig->GetSchemeNames(); + const OUString* pSchemes = aSchemes.getConstArray(); for(sal_Int32 i = 0; i < aSchemes.getLength(); i++) m_pColorSchemeLB->InsertEntry(pSchemes[i]); m_pColorSchemeLB->SelectEntry(pColorConfig->GetCurrentSchemeName()); @@ -1179,7 +1179,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE))); if(RET_YES == aQuery.Execute()) { - rtl::OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); + OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos()); m_pColorSchemeLB->SelectEntryPos(0); m_pColorSchemeLB->GetSelectHdl().Call(m_pColorSchemeLB); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 86b180f0e887..218b67aec1be 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -54,9 +54,9 @@ static long nStaticTabs[]= // static function ------------------------------------------------------- -static String getNormDicEntry_Impl(const rtl::OUString &rText) +static String getNormDicEntry_Impl(const OUString &rText) { - rtl::OUString aTmp(comphelper::string::stripEnd(rText, '.')); + OUString aTmp(comphelper::string::stripEnd(rText, '.')); return comphelper::string::remove(aTmp, '='); } @@ -606,7 +606,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) //! ...IsVisible should reflect whether the dictionary is a negativ //! or not (hopefully...) sal_Bool bIsNegEntry = aReplaceFT.IsVisible(); - ::rtl::OUString aRplcText; + OUString aRplcText; if(bIsNegEntry) aRplcText = aReplaceStr; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d495a243231d..e1ab16c88171 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -97,8 +97,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::utl; -using ::rtl::OString; -using ::rtl::OUString; // class OfaMiscTabPage -------------------------------------------------- @@ -362,7 +360,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) { sal_Int64 nNum = m_pYearValueField->GetValue(); - rtl::OUString aOutput(rtl::OUString::number(nNum)); + OUString aOutput(OUString::number(nNum)); m_pYearValueField->SetText(aOutput); m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) ); TwoFigureHdl( pEd ); @@ -623,7 +621,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)' if( m_pIconStyleLB->GetEntryCount() > 1 ) { - ::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); + OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); aAutoStr += " ("; @@ -636,7 +634,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); m_pIconStyleLB->RemoveEntry( 0 ); - m_pIconStyleLB->InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); + m_pIconStyleLB->InsertEntry( aAutoStr += OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); // separate auto and other icon themes m_pIconStyleLB->SetSeparatorPos( 0 ); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index cc4e667f7e0b..e1a2436f3fcb 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -174,7 +174,7 @@ class OfaLanguagesTabPage : public SfxTabPage sal_Bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; - rtl::OUString m_sUserLocaleValue; + OUString m_sUserLocaleValue; DECL_LINK( SupportHdl, CheckBox* ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 934f0c841b20..a3f25e0f7986 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -371,11 +371,11 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) // updating the initial if (nField < nInits && rShortName.pEdit->IsEnabled()) { - rtl::OUString sShortName = rShortName.pEdit->GetText(); + OUString sShortName = rShortName.pEdit->GetText(); while ((unsigned)sShortName.getLength() < nInits) - sShortName += rtl::OUString(' '); - rtl::OUString sName = pEdit->GetText(); - rtl::OUString sLetter = rtl::OUString(sName.getLength() ? sName.toChar() : ' '); + sShortName += OUString(' '); + OUString sName = pEdit->GetText(); + OUString sLetter = OUString(sName.getLength() ? sName.toChar() : ' '); rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim()); } return 0; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index c8bd32a87c2a..668d35490d83 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -93,7 +93,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sfx2; -using ::rtl::OUString; // static ---------------------------------------------------------------- diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 42b120686dd4..1325c796883a 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -90,14 +90,14 @@ private: String sFromBrowser; - const rtl::OUString aProxyModePN; - const rtl::OUString aHttpProxyPN; - const rtl::OUString aHttpPortPN; - const rtl::OUString aHttpsProxyPN; - const rtl::OUString aHttpsPortPN; - const rtl::OUString aFtpProxyPN; - const rtl::OUString aFtpPortPN; - const rtl::OUString aNoProxyDescPN; + const OUString aProxyModePN; + const OUString aHttpProxyPN; + const OUString aHttpPortPN; + const OUString aHttpsProxyPN; + const OUString aHttpsPortPN; + const OUString aFtpProxyPN; + const OUString aFtpPortPN; + const OUString aNoProxyDescPN; uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 23e37a9fd86c..8f7adca0dd97 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------- -bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB ) +bool areListsEqual( const Sequence< OUString >& rListA, const Sequence< OUString >& rListB ) { bool bRet = true; const sal_Int32 nLen = rListA.getLength(); @@ -67,8 +67,8 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< : bRet = false; else { - const ::rtl::OUString* pStringA = rListA.getConstArray(); - const ::rtl::OUString* pStringB = rListB.getConstArray(); + const OUString* pStringA = rListA.getConstArray(); + const OUString* pStringB = rListB.getConstArray(); for ( sal_Int32 i = 0; i < nLen; ++i ) { @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { - Sequence< ::rtl::OUString > aParameterList; + Sequence< OUString > aParameterList; if ( !m_pParamDlg ) { m_pParamDlg = new SvxJavaParameterDlg( this ); @@ -277,11 +277,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { rtl_uString** pParamArr = m_parParameters; aParameterList.realloc( m_nParamSize ); - ::rtl::OUString* pParams = aParameterList.getArray(); + OUString* pParams = aParameterList.getArray(); for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) { rtl_uString* pParam = *pParamArr++; - pParams[i] = ::rtl::OUString( pParam ); + pParams[i] = OUString( pParam ); } m_pParamDlg->SetParameters( aParameterList ); } @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) javaFrameworkError eErr = jfw_getUserClassPath( &m_pClassPath ); if ( JFW_E_NONE == eErr && m_pClassPath ) { - sClassPath = String( ::rtl::OUString( m_pClassPath ) ); + sClassPath = String( OUString( m_pClassPath ) ); m_pPathDlg->SetClassPath( sClassPath ); } } @@ -478,7 +478,7 @@ void SvxJavaOptionsPage::LoadJREs() void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { - rtl::OUStringBuffer sEntry; + OUStringBuffer sEntry; sEntry.append('\t'); sEntry.append(_pInfo->sVendor); sEntry.append('\t'); @@ -487,7 +487,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE ) sEntry.append(m_sAccessibilityText); SvTreeListEntry* pEntry = m_pJavaList->InsertEntry(sEntry.makeStringAndClear()); - INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) ); + INetURLObject aLocObj( OUString( _pInfo->sLocation ) ); String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); pEntry->SetUserData( pLocation ); } @@ -516,7 +516,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) // ----------------------------------------------------------------------- -void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) +void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { bool bStartAgain = true; JavaInfo* pInfo = NULL; @@ -600,11 +600,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) javaFrameworkError eErr = JFW_E_NONE; if ( m_pParamDlg ) { - Sequence< ::rtl::OUString > aParamList = m_pParamDlg->GetParameters(); + Sequence< OUString > aParamList = m_pParamDlg->GetParameters(); sal_Int32 i, nSize = aParamList.getLength(); rtl_uString** pParamArr = (rtl_uString**)rtl_allocateMemory( sizeof(rtl_uString*) * nSize ); rtl_uString** pParamArrIter = pParamArr; - const ::rtl::OUString* pList = aParamList.getConstArray(); + const OUString* pList = aParamList.getConstArray(); for ( i = 0; i < nSize; ++i ) pParamArr[i] = pList[i].pData; eErr = jfw_setVMParameters( pParamArrIter, nSize ); @@ -633,7 +633,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) if ( m_pPathDlg ) { - ::rtl::OUString sPath( m_pPathDlg->GetClassPath() ); + OUString sPath( m_pPathDlg->GetClassPath() ); if ( m_pPathDlg->GetOldPath() != String( sPath ) ) { eErr = jfw_setUserClassPath( sPath.pData ); @@ -771,7 +771,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg() IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) { - rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); + OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); m_aAssignBtn.Enable(!sParam.isEmpty()); return 0; @@ -781,7 +781,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) { - rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); + OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); if (!sParam.isEmpty()) { sal_uInt16 nPos = m_aAssignedList.GetEntryPos( sParam ); @@ -846,23 +846,23 @@ short SvxJavaParameterDlg::Execute() // ----------------------------------------------------------------------- -Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const +Sequence< OUString > SvxJavaParameterDlg::GetParameters() const { sal_uInt16 nCount = m_aAssignedList.GetEntryCount(); - Sequence< ::rtl::OUString > aParamList( nCount ); - ::rtl::OUString* pArray = aParamList.getArray(); + Sequence< OUString > aParamList( nCount ); + OUString* pArray = aParamList.getArray(); for ( sal_uInt16 i = 0; i < nCount; ++i ) - pArray[i] = ::rtl::OUString( m_aAssignedList.GetEntry(i) ); + pArray[i] = OUString( m_aAssignedList.GetEntry(i) ); return aParamList; } // ----------------------------------------------------------------------- -void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams ) +void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) { m_aAssignedList.Clear(); sal_uLong i, nCount = rParams.getLength(); - const ::rtl::OUString* pArray = rParams.getConstArray(); + const OUString* pArray = rParams.getConstArray(); for ( i = 0; i < nCount; ++i ) { String sParam = String( *pArray++ ); @@ -937,7 +937,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), OUString("*.jar;*.zip") ); String sFolder; if ( m_aPathList.GetSelectEntryCount() > 0 ) { diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index cdd96b7fdb3c..07fa6be1bfeb 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -89,7 +89,7 @@ private: void LoadJREs(); void AddJRE( JavaInfo* _pInfo ); void HandleCheckEntry( SvTreeListEntry* _pEntry ); - void AddFolder( const ::rtl::OUString& _rFolder ); + void AddFolder( const OUString& _rFolder ); public: SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -139,8 +139,8 @@ public: virtual short Execute(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const; - void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams ); + ::com::sun::star::uno::Sequence< OUString > GetParameters() const; + void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams ); }; // class SvxJavaClassPathDlg --------------------------------------------- diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 2ca777b5b3d7..93f3c666e9f1 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -817,7 +817,7 @@ void SvxPathTabPage::SetPathList( pImpl->m_xPathSettings->setPropertyValue( sProp, aValue ); // then the writable path - aValue = makeAny( ::rtl::OUString( _rWritablePath ) ); + aValue = makeAny( OUString( _rWritablePath ) ); sProp = sCfgName; sProp += POSTFIX_WRITABLE; pImpl->m_xPathSettings->setPropertyValue( sProp, aValue ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a221e4d176df..9318ba24dd2e 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -458,8 +458,8 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { (void) e; OSL_FAIL( - rtl::OUStringToOString( - (rtl::OUString( + OUStringToOString( + (OUString( "exception in FilterFactory access: ") + e.Message), RTL_TEXTENCODING_UTF8). diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 375a8d383d95..7cae029e184b 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -91,9 +91,9 @@ SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage() // ----------------------------------------------------------------------- void SvxOnlineUpdateTabPage::UpdateLastCheckedText() { - rtl::OUString aDateStr; - rtl::OUString aTimeStr; - rtl::OUString aText; + OUString aDateStr; + OUString aTimeStr; + OUString aText; sal_Int64 lastChecked = 0; m_xUpdateAccess->getByName("LastCheck") >>= lastChecked; @@ -204,7 +204,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) bModified = sal_True; } - rtl::OUString sValue, aURL; + OUString sValue, aURL; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) && @@ -254,7 +254,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_pDestPath->Enable(sal_True); m_pChangePathButton->Enable(sal_True); - rtl::OUString sValue, aPath; + OUString sValue, aPath; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sValue, aPath) ) @@ -289,7 +289,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext); - rtl::OUString aURL; + OUString aURL; if( osl::FileBase::E_None != osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) osl::Security().getHomeDir(aURL); @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) if ( ui::dialogs::ExecutableDialogResults::OK == nRet ) { - rtl::OUString aFolder; + OUString aFolder; if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder)) m_pDestPath->SetText( aFolder ); } @@ -341,7 +341,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(), uno::UNO_QUERY ); - uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0); + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) 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()); } return 0; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 3323f08bc6fb..bdfb8f7a8e74 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -39,8 +39,8 @@ private: FixedText* m_pDestPath; PushButton* m_pChangePathButton; FixedText* m_pLastChecked; - rtl::OUString m_aNeverChecked; - rtl::OUString m_aLastCheckedTemplate; + OUString m_aNeverChecked; + OUString m_aLastCheckedTemplate; DECL_LINK(FileDialogHdl_Impl, void *) ; DECL_LINK(CheckNowHdl_Impl, void *) ; diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index e210df625df0..939985e6bb1c 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -40,12 +40,12 @@ namespace offapp class ODriverEnumerationImpl { protected: - ::std::vector< ::rtl::OUString > m_aImplNames; + ::std::vector< OUString > m_aImplNames; public: ODriverEnumerationImpl(); - const ::std::vector< ::rtl::OUString >& getDriverImplNames() const { return m_aImplNames; } + const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; } }; //-------------------------------------------------------------------- diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index e0f61dddccf5..b329a858b780 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -22,14 +22,10 @@ #include <sal/types.h> +#include <rtl/ustring.hxx> #include <vector> -namespace rtl -{ - class OUString; -} - //........................................................................ namespace offapp { @@ -52,7 +48,7 @@ namespace offapp public: ODriverEnumeration() throw(); ~ODriverEnumeration() throw(); - typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator; + typedef ::std::vector< OUString >::const_iterator const_iterator; const_iterator begin() const throw(); const_iterator end() const throw(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b7bc0b868476..8f5c20f3d5d4 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -114,19 +114,19 @@ LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; // some stuff for easier changes for SvtViewOptions static const sal_Char* pViewOptDataName = "page data"; -#define VIEWOPT_DATANAME rtl::OUString::createFromAscii( pViewOptDataName ) +#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName ) static XOutdevItemPool* mpStaticXOutdevItemPool = 0L; static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { - rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( rtl::OUString( rData ) ) ); + rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( OUString( rData ) ) ); } static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) { Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) ); - rtl::OUString aUserData; + OUString aUserData; aAny >>= aUserData; return String( aUserData ); @@ -159,13 +159,13 @@ static ModuleToGroupNameMap_Impl ModuleMap[] = { NULL, String::EmptyString(), 0xFFFF } }; -static void setGroupName( const rtl::OUString& rModule, const String& rGroupName ) +static void setGroupName( const OUString& rModule, const String& rGroupName ) { sal_uInt16 nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { ModuleMap[ nIndex ].m_sGroupName = rGroupName; @@ -175,14 +175,14 @@ static void setGroupName( const rtl::OUString& rModule, const String& rGroupName } } -static String getGroupName( const rtl::OUString& rModule, bool bForced ) +static String getGroupName( const OUString& rModule, bool bForced ) { String sGroupName; sal_uInt16 nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { sGroupName = ModuleMap[ nIndex ].m_sGroupName; @@ -221,13 +221,13 @@ static void deleteGroupNames() ModuleMap[ nIndex++ ].m_sGroupName = String::EmptyString(); } -static sal_uInt16 getGroupNodeId( const rtl::OUString& rModule ) +static sal_uInt16 getGroupNodeId( const OUString& rModule ) { sal_uInt16 nNodeId = 0xFFFF, nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { nNodeId = ModuleMap[ nIndex ].m_nNodeId; @@ -250,7 +250,7 @@ public: virtual ~MailMergeCfg_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); sal_Bool IsEmailSupported() const {return bIsEmailSupported;} @@ -260,7 +260,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem("Office.Writer/MailMergeWizard"), bIsEmailSupported(sal_False) { - Sequence<rtl::OUString> aNames(1); + Sequence<OUString> aNames(1); aNames.getArray()[0] = "EMailSupported"; const Sequence< Any > aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); @@ -276,7 +276,7 @@ void MailMergeCfg_Impl::Commit() { } -void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } @@ -455,8 +455,8 @@ struct OptionsPageInfo { SfxTabPage* m_pPage; sal_uInt16 m_nPageId; - rtl::OUString m_sPageURL; - rtl::OUString m_sEventHdl; + OUString m_sPageURL; + OUString m_sEventHdl; ExtensionsTabPage* m_pExtPage; OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {} @@ -470,13 +470,13 @@ struct OptionsGroupInfo SfxModule* m_pModule; // used to create the ItemSet sal_uInt16 m_nDialogId; // Id of the former dialog sal_Bool m_bLoadError; // load fails? - rtl::OUString m_sPageURL; + OUString m_sPageURL; ExtensionsTabPage* m_pExtPage; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ), m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( sal_False ), - m_sPageURL( rtl::OUString() ), m_pExtPage( NULL ) {} + m_sPageURL( OUString() ), m_pExtPage( NULL ) {} ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; @@ -512,7 +512,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( InitTreeAndHandler(); Initialize( _xFrame ); - LoadExtensionOptions( rtl::OUString() ); + LoadExtensionOptions( OUString() ); ResizeTreeLB(); if (bActivateLastSelection) ActivateLastSelection(); @@ -522,7 +522,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( // Ctor() with ExtensionId ----------------------------------------------- -OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) : +OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) : SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ), INI_LIST() @@ -846,7 +846,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() && sExpand.Match( sPageURL ) == STRING_MATCH ) { // cut protocol - ::rtl::OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) ); + OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) ); // decode uri class chars sTemp = ::rtl::Uri::decode( sTemp, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); @@ -1146,7 +1146,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() } { - ::rtl::OUStringBuffer sTitleBuf(sTitle); + OUStringBuffer sTitleBuf(sTitle); sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); sTitleBuf.append(aTreeLB.GetEntryText(pParent)); sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); @@ -1265,9 +1265,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) nMinTrail = 2; if (xProp.is()) { - xProp->getPropertyValue( rtl::OUString( + xProp->getPropertyValue( OUString( UPN_HYPH_MIN_LEADING) ) >>= nMinLead; - xProp->getPropertyValue( rtl::OUString( + xProp->getPropertyValue( OUString( UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail; } aHyphen.GetMinLead() = (sal_uInt8)nMinLead; @@ -1298,7 +1298,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) sal_Bool bVal = sal_False; if (xProp.is()) { - xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal; + xProp->getPropertyValue( OUString( UPN_IS_SPELL_AUTO) ) >>= bVal; } pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal)); @@ -1438,7 +1438,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XPropertySet > xProp( - xMgr->createInstance( ::rtl::OUString( "com.sun.star.linguistic2.LinguProperties" ) ), + xMgr->createInstance( OUString( "com.sun.star.linguistic2.LinguProperties" ) ), UNO_QUERY ); if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) ) { @@ -1447,10 +1447,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - rtl::OUString(UPN_HYPH_MIN_LEADING), + OUString(UPN_HYPH_MIN_LEADING), makeAny((sal_Int16) pHyphenItem->GetMinLead()) ); xProp->setPropertyValue( - rtl::OUString(UPN_HYPH_MIN_TRAILING), + OUString(UPN_HYPH_MIN_TRAILING), makeAny((sal_Int16) pHyphenItem->GetMinTrail()) ); } bSaveSpellCheck = sal_True; @@ -1486,7 +1486,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - rtl::OUString(UPN_IS_SPELL_AUTO), + OUString(UPN_IS_SPELL_AUTO), makeAny(bOnlineSpelling) ); } } @@ -1510,9 +1510,9 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } } -rtl::OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) +OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) { - rtl::OUString sIdentifier; + OUString sIdentifier; Reference < XFrame > xCurrentFrame( _xFrame ); Reference < XModuleManager2 > xModuleManager = ModuleManager::create(::comphelper::getProcessComponentContext()); if ( !xCurrentFrame.is() ) @@ -1566,7 +1566,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Disable Online Update page if service not installed if( RID_SVXPAGE_ONLINEUPDATE == nPageId ) { - const ::rtl::OUString sService = "com.sun.star.setup.UpdateCheck"; + const OUString sService = "com.sun.star.setup.UpdateCheck"; try { @@ -1619,8 +1619,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } - rtl::OUString aFactory = getCurrentFactory_Impl( _xFrame ); - rtl::OUString sTemp = GetModuleIdentifier( _xFrame ); + OUString aFactory = getCurrentFactory_Impl( _xFrame ); + OUString sTemp = GetModuleIdentifier( _xFrame ); DBG_ASSERT( sTemp == aFactory, "S H I T!!!" ); // Writer and Writer/Web options @@ -1652,7 +1652,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup ); #endif } @@ -1668,7 +1668,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup ); #endif } } @@ -1941,7 +1941,7 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule ) return false; } -void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtensionId ) +void OfaTreeOptionsDialog::LoadExtensionOptions( const OUString& rExtensionId ) { Module* pModule = NULL; @@ -1957,9 +1957,9 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtension delete pModule; } -rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame ) +OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame ) { - rtl::OUString sModule; + OUString sModule; Reference < XFrame > xCurrentFrame( rFrame ); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference < XModuleManager2 > xModuleManager = ModuleManager::create(xContext); @@ -1989,16 +1989,16 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame } Module* OfaTreeOptionsDialog::LoadModule( - const rtl::OUString& rModuleIdentifier ) + const OUString& rModuleIdentifier ) { Module* pModule = NULL; Reference< XNameAccess > xSet( officecfg::Office::OptionsDialog::Modules::get()); - Sequence< rtl::OUString > seqNames = xSet->getElementNames(); + Sequence< OUString > seqNames = xSet->getElementNames(); for ( int i = 0; i < seqNames.getLength(); ++i ) { - rtl::OUString sModule( seqNames[i] ); + OUString sModule( seqNames[i] ); if ( rModuleIdentifier == sModule ) { // current active module found @@ -2014,7 +2014,7 @@ Module* OfaTreeOptionsDialog::LoadModule( xModAccess->getByName( "Nodes" ) >>= xNodeAccess; if ( xNodeAccess.is() ) { - Sequence< rtl::OUString > xTemp = xNodeAccess->getElementNames(); + Sequence< OUString > xTemp = xNodeAccess->getElementNames(); Reference< XNameAccess > xAccess; sal_Int32 nIndex = -1; for ( int x = 0; x < xTemp.getLength(); ++x ) @@ -2052,14 +2052,14 @@ Module* OfaTreeOptionsDialog::LoadModule( } VectorOfNodes OfaTreeOptionsDialog::LoadNodes( - Module* pModule, const rtl::OUString& rExtensionId) + Module* pModule, const OUString& rExtensionId) { VectorOfNodes aOutNodeList; Reference< XNameAccess > xSet( officecfg::Office::OptionsDialog::Nodes::get()); VectorOfNodes aNodeList; - Sequence< rtl::OUString > seqNames = xSet->getElementNames(); + Sequence< OUString > seqNames = xSet->getElementNames(); for ( int i = 0; i < seqNames.getLength(); ++i ) { @@ -2069,7 +2069,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( if ( xNodeAccess.is() ) { - rtl::OUString sNodeId, sLabel, sPageURL, sGroupId; + OUString sNodeId, sLabel, sPageURL, sGroupId; bool bAllModules = false; sal_Int32 nGroupIndex = 0; @@ -2098,7 +2098,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( xNodeAccess->getByName( "Leaves" ) >>= xLeavesSet; if ( xLeavesSet.is() ) { - Sequence< rtl::OUString > seqLeaves = xLeavesSet->getElementNames(); + Sequence< OUString > seqLeaves = xLeavesSet->getElementNames(); for ( int j = 0; j < seqLeaves.getLength(); ++j ) { Reference< XNameAccess > xLeaveAccess; @@ -2106,7 +2106,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( if ( xLeaveAccess.is() ) { - rtl::OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId; + OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId; sal_Int32 nLeafGrpIdx = 0; xLeaveAccess->getByName( "Id" ) >>= sId; @@ -2174,7 +2174,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( sal_uInt32 i = 0, j = 0; for ( ; i < pModule->m_aNodeList.size(); ++i ) { - rtl::OUString sNodeId = pModule->m_aNodeList[i]->m_sId; + OUString sNodeId = pModule->m_aNodeList[i]->m_sId; for ( j = 0; j < aNodeList.size(); ++j ) { OptionsNode* pNode = aNodeList[j]; @@ -2193,7 +2193,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( return aOutNodeList; } -static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB ) +static sal_uInt16 lcl_getGroupId( const OUString& rGroupName, const SvTreeListBox& rTreeLB ) { String sGroupName( rGroupName ); sal_uInt16 nRet = 0; @@ -2290,8 +2290,8 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, - const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : + Window* pParent, WinBits nStyle, const OUString& rPageURL, + const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : TabPage( pParent, nStyle ), @@ -2331,7 +2331,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), UNO_QUERY ); m_xPage = Reference < awt::XWindow >( m_xWinProvider->createContainerWindow( - m_sPageURL, rtl::OUString(), xParent, m_xEventHdl ), UNO_QUERY ); + m_sPageURL, OUString(), xParent, m_xEventHdl ), UNO_QUERY ); Reference< awt::XControl > xPageControl( m_xPage, UNO_QUERY ); if ( xPageControl.is() ) @@ -2358,7 +2358,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() // ----------------------------------------------------------------------- -sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction ) +sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { sal_Bool bRet = sal_False; if ( m_xEventHdl.is() ) diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 49a0354bdf86..56ca925ccbfa 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -188,9 +188,9 @@ void WebConnectionInfoDialog::FillPasswordList() for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) { - ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); - aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); - aUIEntry += ::rtl::OUString( "*" ); + OUString aUIEntry( aUrls[ nURLIdx ] ); + aUIEntry += OUString::valueOf( (sal_Unicode)'\t' ); + aUIEntry += OUString( "*" ); SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } @@ -208,8 +208,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( pEntry ) { - ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); - ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); + OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); + OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); uno::Reference< task::XPasswordContainer2 > xPasswdContainer( task::PasswordContainer::create(comphelper::getProcessComponentContext())); @@ -264,8 +264,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( pEntry ) { - ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); - ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); + OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); + OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); ::comphelper::SimplePasswordRequest* pPasswordRequest = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 930073fad779..8f134be3192c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -714,7 +714,7 @@ void SvxBackgroundTabPage::FillUserData() */ { - SetUserData( m_pBtnPreview->IsChecked() ? rtl::OUString('1') : rtl::OUString('0') ); + SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') ); } //------------------------------------------------------------------------ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index b7f0e7f701b4..02817b602f44 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() // ----------------------------------------------------------------------- -SvxCharBasePage::SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( sal_False ) @@ -3370,7 +3370,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) if ( !bFound ) { - nEntryPos = pBox->InsertEntry( rtl::OUString(cBracket) ); + nEntryPos = pBox->InsertEntry( OUString(cBracket) ); pBox->SelectEntryPos( nEntryPos ); } } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 5fc05943e37c..6c127c4541e7 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -341,13 +341,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL ) { pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) ); } else { OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); } } @@ -420,7 +420,7 @@ void _SfxMacroTabPage::FillMacroList() ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >(), GetFrame(), - ::rtl::OUString() ); + OUString() ); } void _SfxMacroTabPage::FillEvents() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f208845d5e46..1a35b045a30a 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -144,7 +144,7 @@ void SvxNumberPreview::Paint( const Rectangle& ) if ( mnPos != STRING_NOTFOUND ) { - long nCharWidth = GetTextWidth( rtl::OUString::valueOf( mnChar ) ); + long nCharWidth = GetTextWidth( OUString::valueOf( mnChar ) ); int nNumCharsToInsert = 0; if (nCharWidth > 0) nNumCharsToInsert = nLeadSpace / nCharWidth; @@ -518,7 +518,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // is this a calc document Reference< XServiceInfo > xSI( pDocSh->GetModel(), UNO_QUERY ); if ( xSI.is() ) - bUseStarFormat = xSI->supportsService( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); + bUseStarFormat = xSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); } pNumFmtShell->SetUseStarFormat( bUseStarFormat ); @@ -1687,12 +1687,12 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler ) void SvxNumberFormatTabPage::FillCurrencyBox() { - std::vector<rtl::OUString> aList; + std::vector<OUString> aList; sal_uInt16 nSelPos=0; pNumFmtShell->GetCurrencySymbols(aList, &nSelPos); - for(std::vector<rtl::OUString>::iterator i = aList.begin() + 1;i != aList.end(); ++i) + for(std::vector<OUString>::iterator i = aList.begin() + 1;i != aList.end(); ++i) m_pLbCurrency->InsertEntry(*i); m_pLbCurrency->SelectEntryPos(nSelPos); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index dc5431959274..93ef1298b686 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -454,7 +454,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pTypeBtn = &aDezTab; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER ) pTypeBtn = &aCenterTab; @@ -477,7 +477,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() { pFillBtn = &aFillSpecial; aFillChar.Enable(); - aFillChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetFill() ) ); + aFillChar.SetText( OUString( (sal_Unicode)aAktTab.GetFill() ) ); } pFillBtn->Check(); } @@ -619,7 +619,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) eAdj = SVX_TAB_ADJUST_DECIMAL; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } aAktTab.GetAdjustment() = eAdj; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c6716c1798e6..56939ddb7a28 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2253,7 +2253,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) if( aTsbStepCount.GetState() == STATE_NOCHECK ) { if( aNumFldStepCount.GetText().isEmpty() ) - aNumFldStepCount.SetText(rtl::OUString("64")); + aNumFldStepCount.SetText(OUString("64")); aNumFldStepCount.Enable(); } diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx index 8164dea855ec..60c3591b3d1c 100644 --- a/cui/source/uno/services.cxx +++ b/cui/source/uno/services.cxx @@ -34,13 +34,12 @@ #include "cppuhelper/factory.hxx" #include <cppuhelper/implementationentry.hxx> -using rtl::OUString; using namespace com::sun::star; namespace cui { -extern rtl::OUString SAL_CALL ColorPicker_getImplementationName(); +extern OUString SAL_CALL ColorPicker_getImplementationName(); extern uno::Reference< uno::XInterface > SAL_CALL ColorPicker_createInstance( uno::Reference< uno::XComponentContext > const & ) SAL_THROW( (uno::Exception) ); -extern uno::Sequence< rtl::OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException ); +extern uno::Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException ); } namespace |