summaryrefslogtreecommitdiff
path: root/framework/source/uielement/fontsizemenucontroller.cxx
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 /framework/source/uielement/fontsizemenucontroller.cxx
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 'framework/source/uielement/fontsizemenucontroller.cxx')
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 9defbc9965a1..22ddd7619601 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -71,9 +71,9 @@ FontSizeMenuController::~FontSizeMenuController()
}
// private function
-rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame )
+OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame )
{
- rtl::OUString aPrinterName;
+ OUString aPrinterName;
if ( rFrame.is() )
{
@@ -137,7 +137,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
{
FontList* pFontList = 0;
Printer* pInfoPrinter = 0;
- rtl::OUString aPrinterName;
+ OUString aPrinterName;
SolarMutexGuard aSolarMutexGuard;
@@ -166,13 +166,13 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
nSizeCount++;
sal_uInt16 nPos = 0;
- const rtl::OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" );
+ const OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" );
// first insert font size names (for simplified/traditional chinese)
float fPoint;
FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() );
m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()];
- rtl::OUString aCommand;
+ OUString aCommand;
if ( !aFontSizeNames.IsEmpty() )
{
@@ -190,7 +190,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
}
}
@@ -209,7 +209,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
}
pTempAry++;
@@ -228,7 +228,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
pTempAry++;
@@ -298,9 +298,9 @@ void FontSizeMenuController::impl_setPopupMenu()
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
com::sun::star::util::URL aTargetURL;
// Register for font name updates which gives us info about the current font!
- aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = OUString( ".uno:CharFontName" );
m_xURLTransformer->parseStrict( aTargetURL );
- m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -311,7 +311,7 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = OUString( ".uno:CharFontName" );
m_xURLTransformer->parseStrict( aTargetURL );
aLock.clear();