summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /cui/source/dialogs
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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/source/dialogs')
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx28
-rw-r--r--cui/source/dialogs/SpellDialog.cxx45
-rw-r--r--cui/source/dialogs/about.cxx10
-rw-r--r--cui/source/dialogs/colorpicker.cxx5
-rw-r--r--cui/source/dialogs/cuicharmap.cxx12
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx6
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx16
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx2
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx13
-rw-r--r--cui/source/dialogs/hldocntp.cxx10
-rw-r--r--cui/source/dialogs/hlinettp.cxx12
-rw-r--r--cui/source/dialogs/hlmailtp.cxx6
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx10
-rw-r--r--cui/source/dialogs/iconcdlg.cxx10
-rw-r--r--cui/source/dialogs/insdlg.cxx8
-rw-r--r--cui/source/dialogs/insrc.cxx2
-rw-r--r--cui/source/dialogs/multifil.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx4
-rw-r--r--cui/source/dialogs/plfilter.cxx12
-rw-r--r--cui/source/dialogs/postdlg.cxx2
-rw-r--r--cui/source/dialogs/showcols.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx3
-rw-r--r--cui/source/dialogs/thesdlg_impl.hxx1
24 files changed, 109 insertions, 114 deletions
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;