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 /sc/source/ui/cctrl | |
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 'sc/source/ui/cctrl')
-rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/cctrl/editfield.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/cctrl/tbinsert.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 8 |
5 files changed, 10 insertions, 13 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index e13894aef1f1..3d33e800e2a9 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -33,8 +33,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::accessibility::XAccessibleContext; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::unordered_map; using ::std::auto_ptr; diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index ab583cb3d5d0..5c1d41563b7e 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,7 +27,6 @@ #include "docpool.hxx" #include "patattr.hxx" -using rtl::OUString; ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : mpDoc(pDoc), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d7b8013f8b12..71abbf914955 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -52,7 +52,7 @@ ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : bool ScDoubleField::GetValue( double& rfValue ) const { - rtl::OUString aStr(comphelper::string::strip(GetText(), ' ')); + OUString aStr(comphelper::string::strip(GetText(), ' ')); bool bOk = !aStr.isEmpty(); if( bOk ) { diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index af9a1345dd58..5d6e2181817f 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -68,8 +68,8 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() @@ -84,17 +84,17 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow() sal_uInt16 nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { - rtl::OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); + OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aInsertBarResStr ); } else if (nSlotId == SID_TBXCTL_INSCELLS) { - rtl::OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); + OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); createAndPositionSubToolBar( aInsertCellsBarResStr ); } else { - rtl::OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); + OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aInsertObjectBarResStr ); } return NULL; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 120a633b4812..9dbab51bbff3 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,10 +311,10 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } @@ -351,10 +351,10 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } |