diff options
Diffstat (limited to 'chart2/source/controller/main')
46 files changed, 169 insertions, 183 deletions
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 21bad8fcafe0..c3e98b01cab5 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -122,7 +122,7 @@ public: */ virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() = 0; }; @@ -219,7 +219,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> SAL_CALL queryDispatch( const ::com::sun::star::util::URL& rURL - , const rtl::OUString& rTargetFrameName + , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); @@ -398,16 +398,16 @@ public: // ::com::sun::star::lang XMultiServiceFactory //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstance( const ::rtl::OUString& aServiceSpecifier ) + createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, + createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -453,7 +453,7 @@ public: virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -599,9 +599,9 @@ private: //executeDispatch methods void SAL_CALL executeDispatch_ObjectProperties(); - void SAL_CALL executeDispatch_FormatObject( const ::rtl::OUString& rDispatchCommand ); - void SAL_CALL executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID ); - bool executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); + void SAL_CALL executeDispatch_FormatObject( const OUString& rDispatchCommand ); + void SAL_CALL executeDlg_ObjectProperties( const OUString& rObjectCID ); + bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); void SAL_CALL executeDispatch_ChartType(); @@ -694,10 +694,10 @@ private: }; /// @return </sal_True>, if resize/move was successful bool impl_moveOrResizeObject( - const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); - bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset ); + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); + bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - ::std::set< ::rtl::OUString > impl_getAvailableCommands(); + ::std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see @@ -713,7 +713,7 @@ private: void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic, const ::Point & aPosition ); void impl_PasteShapes( SdrModel* pModel ); - void impl_PasteStringAsTextShape( const ::rtl::OUString& rString, const ::com::sun::star::awt::Point& rPosition ); + void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition ); void impl_SetMousePointer( const MouseEvent & rEvent ); void impl_ClearSelection(); diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 8c7c733ff59b..8741ec9a21b7 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -72,7 +72,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 8091aa63046f..b0c56b81fe26 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -116,7 +116,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang void SAL_CALL ChartController::executeDispatch_PositionAndSize() { - const ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + const OUString aCID( m_aSelection.getSelectedCID() ); if( aCID.isEmpty() ) return; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 145e7e34ca8a..f06c271b5c89 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -69,7 +69,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 80056ac468b8..8fd50b0a64d7 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -135,7 +135,7 @@ bool ChartController::EndTextEdit() pOutliner->GetParagraph( 0 ), pOutliner->GetParagraphCount() ); - ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); + OUString aObjectCID = m_aSelection.getSelectedCID(); if ( !aObjectCID.isEmpty() ) { uno::Reference< beans::XPropertySet > xPropSet = diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 17581e3b06ab..889be4313877 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -601,7 +600,7 @@ bool ChartController::executeDispatch_Delete() bool bReturn = false; // remove the selected object - rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if( !aCID.isEmpty() ) { if( !isObjectDeleteable( uno::Any( aCID ) ) ) @@ -759,7 +758,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, ::rtl::OUString( String( + ActionDescriptionProvider::DELETE, OUString( String( SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), m_xUndoManager ); chart2::DataPointLabel aLabel; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index a104d13b9a60..0c748f13d7c5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. namespace chart @@ -134,9 +133,9 @@ bool lcl_MoveObjectLogic( void lcl_insertMenuCommand( const uno::Reference< awt::XPopupMenu > & xMenu, const uno::Reference< awt::XMenuExtended > & xMenuEx, - sal_Int16 nId, const ::rtl::OUString & rCommand ) + sal_Int16 nId, const OUString & rCommand ) { - static ::rtl::OUString aEmptyString; + static OUString aEmptyString; xMenu->insertItem( nId, aEmptyString, 0, -1 ); xMenuEx->setCommand( nId, rCommand ); } @@ -729,7 +728,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) } else { - rtl::OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); + OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) ) pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() ); } @@ -936,7 +935,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel ) bool bEditText = false; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID ); @@ -1404,7 +1403,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) nCode == KEY_DOWN ) { bDrag = true; - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); sal_Int32 nOffsetPercentDummy( 0 ); awt::Point aMinimumPosition( 0, 0 ); awt::Point aMaximumPosition( 0, 0 ); @@ -1577,7 +1576,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) bool ChartController::requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, + OUString & rOutQuickHelpText, awt::Rectangle & rOutEqualRect ) { uno::Reference< frame::XModel > xChartModel; @@ -1587,7 +1586,7 @@ bool ChartController::requestQuickHelp( return false; // help text - ::rtl::OUString aCID; + OUString aCID; if( m_pDrawViewWrapper ) { aCID = SelectionHelper::getHitObjectCID( @@ -1622,9 +1621,9 @@ bool ChartController::requestQuickHelp( if ( rSelection.hasValue() ) { const uno::Type& rType = rSelection.getValueType(); - if ( rType == ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) ) ) + if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) ) { - ::rtl::OUString aNewCID; + OUString aNewCID; if ( ( rSelection >>= aNewCID ) && m_aSelection.setSelection( aNewCID ) ) { bSuccess = true; @@ -1672,7 +1671,7 @@ bool ChartController::requestQuickHelp( uno::Any aReturn; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { aReturn = uno::makeAny( aCID ); @@ -1746,7 +1745,7 @@ void ChartController::impl_selectObjectAndNotiy() } bool ChartController::impl_moveOrResizeObject( - const ::rtl::OUString & rCID, + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ) @@ -1829,7 +1828,7 @@ bool ChartController::impl_moveOrResizeObject( return bResult; } -bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double fAdditionalOffset ) +bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditionalOffset ) { bool bResult = false; if( fAdditionalOffset < -1.0 || fAdditionalOffset > 1.0 || fAdditionalOffset == 0.0 ) @@ -1985,7 +1984,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) return; } - ::rtl::OUString aHitObjectCID( + OUString aHitObjectCID( SelectionHelper::getHitObjectCID( aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ )); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 83d075a045c5..e09c298ddfa0 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 5b2c03b3aaf6..2e2713ba3b67 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -62,10 +62,10 @@ ChartFrameLoader::~ChartFrameLoader() APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartFrameLoader + uno::Sequence< OUString > ChartFrameLoader ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME; return aSNS; } @@ -146,7 +146,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); if( aIt != aMediaDescriptor.end()) { - ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >()); + OUString aURL( (*aIt).second.get< OUString >()); if( aURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) { diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index efc9782c1874..a1742ea40502 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index d4b78aa7256b..2e1bd460a2e1 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -203,7 +203,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) { // Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel() Point aLogicHitPos = PixelToLogic( GetPointerPosPixel()); - ::rtl::OUString aQuickHelpText; + OUString aQuickHelpText; awt::Rectangle aHelpRect; bool bIsBalloonHelp( Help::IsBalloonHelpEnabled() ); bHelpHandled = m_pWindowController->requestQuickHelp( aLogicHitPos, bIsBalloonHelp, aQuickHelpText, aHelpRect ); diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 0f609260aea5..2c547fba4c04 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index c0a82ecb61ca..b1d8b9f14000 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -73,10 +73,10 @@ protected: called with this parameter set to give an initial state. */ virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0; - /** calls fireStatusEvent( ::rtl::OUString, xSingleListener ) + /** calls fireStatusEvent( OUString, xSingleListener ) */ void fireAllStatusEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); @@ -90,12 +90,12 @@ protected: called with this parameter set to give an initial state. */ void fireStatusEventForURL( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Any & rState, bool bEnabled, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >(), - const ::rtl::OUString & rFeatureDescriptor = ::rtl::OUString() ); + const OUString & rFeatureDescriptor = OUString() ); // ____ XDispatch ____ virtual void SAL_CALL dispatch( @@ -130,7 +130,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; private: - typedef ::std::map< ::rtl::OUString, ::cppu::OInterfaceContainerHelper* > + typedef ::std::map< OUString, ::cppu::OInterfaceContainerHelper* > tListenerMap; tListenerMap m_aListeners; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 2c02b0261291..483fedf4d9d3 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 2e4a3b3131f6..0f568f7bf08c 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -84,7 +84,7 @@ public: void setChartDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xChartDispatch, - const ::std::set< ::rtl::OUString > & rChartCommands ); + const ::std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if implemented here. If the URL is not implemented here, it should be @@ -117,7 +117,7 @@ public: private: typedef - ::std::map< ::rtl::OUString, + ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > tDispatchMap; @@ -132,9 +132,9 @@ private: ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher; - ::std::set< ::rtl::OUString > m_aChartCommands; + ::std::set< OUString > m_aChartCommands; - ::std::set< ::rtl::OUString > m_aContainerDocumentCommands; + ::std::set< OUString > m_aContainerDocumentCommands; ChartController* m_pChartController; DrawCommandDispatch* m_pDrawCommandDispatch; diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 812dbe58a050..31a088120f35 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -57,11 +57,11 @@ public: FieldUnit getFieldUnit(); virtual void Commit(); - virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames); }; CalcConfigItem::CalcConfigItem() - : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" )) + : ConfigItem( OUString( "Office.Calc/Layout" )) { } @@ -70,7 +70,7 @@ CalcConfigItem::~CalcConfigItem() } void CalcConfigItem::Commit() {} -void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {} +void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {} FieldUnit CalcConfigItem::getFieldUnit() { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index bcde205f12e4..f4c1669c3753 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -701,7 +700,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) return false; } -bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ) +bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const OUString& rCommand ) { ShapeController* pShapeController = ( m_pDispatchContainer ? m_pDispatchContainer->getShapeController() : NULL ); if ( pShapeController ) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index bf0895edfabb..a165bc259b46 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -82,7 +82,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XModifyListener ____ @@ -97,13 +97,13 @@ protected: private: void fireStatusEventForURLImpl( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); - bool commandAvailable( const ::rtl::OUString & rCommand ); + bool commandAvailable( const OUString & rCommand ); void updateCommandAvailability(); - bool isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ); + bool isShapeControllerCommandAvailable( const OUString& rCommand ); ChartController* m_pChartController; ::com::sun::star::uno::Reference< @@ -116,8 +116,8 @@ private: ::std::auto_ptr< impl::ModelState > m_apModelState; ::std::auto_ptr< impl::ControllerState > m_apControllerState; - mutable ::std::map< ::rtl::OUString, bool > m_aCommandAvailability; - mutable ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > m_aCommandArguments; + mutable ::std::map< OUString, bool > m_aCommandAvailability; + mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments; CommandDispatchContainer* m_pDispatchContainer; }; diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 0c107d0a3538..2724551354a3 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -41,7 +41,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; DragMethod_Base::DragMethod_Base( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType ) : SdrDragMethod( rDrawViewWrapper ) @@ -61,7 +61,7 @@ Reference< frame::XModel > DragMethod_Base::getChartModel() const return Reference< frame::XModel >( m_xChartModel ); } -rtl::OUString DragMethod_Base::getUndoDescription() const +OUString DragMethod_Base::getUndoDescription() const { return ActionDescriptionProvider::createDescription( m_eActionType, diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 148378040243..28ffa918d6da 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -33,12 +33,12 @@ namespace chart class DragMethod_Base : public SdrDragMethod { public: - DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); - virtual rtl::OUString getUndoDescription() const; + virtual OUString getUndoDescription() const; virtual void TakeSdrDragComment(String& rStr) const; virtual Pointer GetSdrDragPointer() const; @@ -48,7 +48,7 @@ protected: protected: DrawViewWrapper& m_rDrawViewWrapper; - rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ActionDescriptionProvider::ActionType m_eActionType; private: diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 27267eaab5a6..abf58cbc149e 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference; using ::basegfx::B2DVector; DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel ) , m_aStartVector(100.0,100.0) @@ -48,7 +48,7 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper , m_aDragDirection(1000.0,1000.0) , m_fDragRange( 1.0 ) { - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); sal_Int32 nOffsetPercent(0); awt::Point aMinimumPosition(0,0); @@ -75,7 +75,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment() void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const { rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED); - rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); + rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); } bool DragMethod_PieSegment::BeginSdrDrag() { diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index 022a188dda9a..a92a855e21ce 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -28,7 +28,7 @@ namespace chart class DragMethod_PieSegment : public DragMethod_Base { public: - DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment(); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index ce8a0e120aaa..00cada78f8a1 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , RotationDirection eRotationDirection ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE ) diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 04d6f6e46cff..e48ff981231a 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -39,7 +39,7 @@ public: }; DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , RotationDirection eRotationDirection ); diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 57b629e0fd05..ffe3ccb95cb8 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -59,13 +59,13 @@ namespace //............................................................................. // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString, bool > + struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > { - bool operator() ( const beans::PropertyValue& rPropValue, const ::rtl::OUString& rName ) const + bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const { return rPropValue.Name.equals( rName ); } - bool operator() ( const ::rtl::OUString& rName, const beans::PropertyValue& rPropValue ) const + bool operator() ( const OUString& rName, const beans::PropertyValue& rPropValue ) const { return rName.equals( rPropValue.Name ); } @@ -97,11 +97,11 @@ void DrawCommandDispatch::initialize() FeatureCommandDispatchBase::initialize(); } -bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) { sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType ); } @@ -137,7 +137,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) sal_Bool bAttributesAppliedFromGallery = sal_False; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - ::std::vector< ::rtl::OUString > aObjList; + ::std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { for ( sal_uInt16 i = 0; i < aObjList.size(); ++i ) @@ -244,15 +244,15 @@ void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) +FeatureState DrawCommandDispatch::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; aReturn.aState <<= false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { switch ( nFeatureId ) @@ -288,7 +288,7 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -297,8 +297,8 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen bool bCreate = false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { m_nFeatureId = nFeatureId; @@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen pDrawViewWrapper->SetCreateMode(); } - const ::rtl::OUString sKeyModifier( "KeyModifier" ); + const OUString sKeyModifier( "KeyModifier" ); const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if( @@ -577,7 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID ) } bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, - OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ) + OUString* pBaseCommand, OUString* pCustomShapeType ) { bool bFound = true; sal_uInt16 nFeatureId = 0; diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 1510346f395b..afa6799ab11c 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -45,7 +45,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); void setAttributes( SdrObject* pObj ); void setLineEnds( SfxItemSet& rAttr ); @@ -59,10 +59,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); @@ -71,10 +71,10 @@ private: void setInsertObj( sal_uInt16 eObj ); SdrObject* createDefaultObject( const sal_uInt16 nID ); - bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ); + bool parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, OUString* pBaseCommand, OUString* pCustomShapeType ); ChartController* m_pChartController; - ::rtl::OUString m_aCustomShapeType; + OUString m_aCustomShapeType; }; //............................................................................. diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index b59945579bbb..2711702d8e7f 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -71,7 +71,7 @@ void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierar while( aIt != aChildren.end() ) { ObjectHierarchy::tOID aOID = *aIt; - ::rtl::OUString aCID = aOID.getObjectCID(); + OUString aCID = aOID.getObjectCID(); ListBoxEntryData aEntry; aEntry.OID = aOID; aEntry.UIName += ObjectNameProvider::getNameForCID( aCID, xChartDoc ); @@ -97,7 +97,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { Reference< view::XSelectionSupplier > xSelectionSupplier( xChartController, uno::UNO_QUERY); ObjectHierarchy::tOID aSelectedOID; - rtl::OUString aSelectedCID; + OUString aSelectedCID; if( xSelectionSupplier.is() ) { aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); @@ -123,7 +123,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { if ( aSelectedOID.isAutoGeneratedObject() ) { - rtl::OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); + OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); for( aIt = m_aEntries.begin(); aIt != m_aEntries.end(); ++aIt ) { if( aIt->OID.getObjectCID().match( aSeriesCID ) ) @@ -144,8 +144,8 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); - rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString(); - aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); + OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); + aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } @@ -252,9 +252,9 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName ); //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() +Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index f32fa37c32f6..025500f9f2ef 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -37,7 +37,7 @@ namespace chart struct ListBoxEntryData { - rtl::OUString UIName; + OUString UIName; ObjectHierarchy::tOID OID; sal_Int32 nHierarchyDepth; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 5362827d47f1..c3b3ce7f5f58 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -44,7 +44,7 @@ void FeatureCommandDispatchBase::initialize() fillSupportedFeatures(); } -bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL ) { SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL ); if ( aIter != m_aSupportedFeatures.end() ) @@ -54,7 +54,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom return false; } -void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL, +void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ ) { if ( rURL.isEmpty() ) @@ -78,7 +78,7 @@ void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) throw (uno::RuntimeException) { - ::rtl::OUString aCommand( URL.Complete ); + OUString aCommand( URL.Complete ); if ( getState( aCommand ).bEnabled ) { execute( aCommand, Arguments ); @@ -89,7 +89,7 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p sal_uInt16 nId, sal_Int16 nGroup ) { ControllerFeature aFeature; - aFeature.Command = ::rtl::OUString::createFromAscii( pAsciiCommandURL ); + aFeature.Command = OUString::createFromAscii( pAsciiCommandURL ); aFeature.nFeatureId = nId; aFeature.GroupId = nGroup; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 06a534251cd5..59d1b32451b9 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -33,9 +33,9 @@ struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation sal_uInt16 nFeatureId; }; -typedef ::std::map< ::rtl::OUString, +typedef ::std::map< OUString, ControllerFeature, - ::std::less< ::rtl::OUString > > SupportedFeatures; + ::std::less< OUString > > SupportedFeatures; struct FeatureState { @@ -57,7 +57,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); protected: // XDispatch @@ -65,14 +65,14 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual void fireStatusEvent( const ::rtl::OUString& rURL, + virtual void fireStatusEvent( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ) = 0; + virtual FeatureState getState( const OUString& rCommand ) = 0; // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; // all the features which should be handled by this class virtual void describeSupportedFeatures() = 0; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 6ed11f9f64fd..ebcb60569747 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -375,12 +374,12 @@ void ImplObjectHierarchy::createWallAndFloor( if( bHasWall && bIsThreeD ) { rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) ); Reference< beans::XPropertySet > xFloor( xDiagram->getFloor()); if( xFloor.is()) rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) ); } } @@ -443,7 +442,7 @@ void ImplObjectHierarchy::createDataSeriesTree( // data lablels if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); aChildParticle+=("="); aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) ); diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 047d55dd5709..fa57560005f7 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -128,7 +128,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType return true; } -bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID +bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel , const awt::Rectangle& rNewPositionAndSize , const awt::Rectangle& rPageRectangle diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 16c795875aa6..950c05df949b 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -43,11 +43,11 @@ using namespace ::com::sun::star; namespace { -rtl::OUString lcl_getObjectName( SdrObject* pObj ) +OUString lcl_getObjectName( SdrObject* pObj ) { if(pObj) return pObj->GetName(); - return rtl::OUString(); + return OUString(); } void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) @@ -71,7 +71,7 @@ bool Selection::hasSelection() return m_aSelectedOID.isValid(); } -rtl::OUString Selection::getSelectedCID() +OUString Selection::getSelectedCID() { return m_aSelectedOID.getObjectCID(); } @@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const return m_aSelectedOID; } -bool Selection::setSelection( const ::rtl::OUString& rCID ) +bool Selection::setSelection( const OUString& rCID ) { if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) ) { @@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* if ( !m_aSelectedOID.isAdditionalShape() ) { - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model if ( !m_aSelectedOID.isAutoGeneratedObject() ) { @@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* } //check whether the diagram was hit but not selected (e.g. because it has no filling): - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject(); if( bBackGroundHit ) { @@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* //check whether the legend was hit but not selected (e.g. because it has no filling): if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) ) { - rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model + OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { @@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ) { SolarMutexGuard aSolarGuard; //find the deepest named group SdrObject* pObj = pInOutObject; - rtl::OUString aName; + OUString aName; if( bGivenObjectMayBeResult ) aName = lcl_getObjectName( pObj ); @@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject , bool bGivenObjectMayBeResult ) { - rtl::OUString aName; + OUString aName; if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) ) { rOutObject = ObjectIdentifier( aName ); @@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject } bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ) { if(rNameOfSelectedObject.isEmpty()) @@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos return true; } -::rtl::OUString SelectionHelper::getHitObjectCID( +OUString SelectionHelper::getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall ) { // //- solar mutex SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos); aRet = lcl_getObjectName( pNewObj );//name of pNewObj @@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos //accept only named objects while searching for the object to select if( !findNamedParent( pNewObj, aRet, true ) ) { - aRet = ::rtl::OUString(); + aRet = OUString(); } - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model //get page when nothing was hit if( aRet.isEmpty() && !pNewObj ) { @@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos { if( aRet.equals( aPageCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); //todo: if more than one diagram is available in future do chack the list of all diagrams here SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID ); if( pDiagram ) @@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos } else if( bGetDiagramInsteadOf_Wall ) { - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( aRet.equals( aWallCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); aRet = aDiagramCID; } } @@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos // \\- solar mutex } -bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID +bool SelectionHelper::isRotateableObject( const OUString& rCID , const uno::Reference< frame::XModel >& xChartModel ) { if( !ObjectIdentifier::isRotateableObject( rCID ) ) @@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) { if(!pObj) return 0; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); if( aName.match("MarkHandles") || aName.match("HandlesOnly") ) return pObj; if( !aName.isEmpty() )//dont't get the markhandles of a different object @@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) if( !pSubList )//no group object !pObj->IsGroupObject() return false; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) ); if( OBJECTTYPE_DATA_POINT == eObjectType || OBJECTTYPE_DATA_LABEL == eObjectType @@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) SdrObject* pSubObj = aIterator.Next(); if( OBJECTTYPE_DATA_SERIES == eObjectType ) { - rtl::OUString aSubName( lcl_getObjectName( pSubObj ) ); + OUString aSubName( lcl_getObjectName( pSubObj ) ); ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) ); if( eSubObjectType!=OBJECTTYPE_DATA_POINT ) return false; diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 992043f68867..5a4273a7fb2a 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -41,7 +41,7 @@ class Selection public: //methods bool hasSelection(); - rtl::OUString getSelectedCID(); + OUString getSelectedCID(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getSelectedAdditionalShape(); ObjectIdentifier getSelectedOID() const; @@ -54,7 +54,7 @@ public: //methods bool isAdditionalShapeSelected() const; //returns true if selection has changed - bool setSelection( const ::rtl::OUString& rCID ); + bool setSelection( const OUString& rCID ); bool setSelection( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); @@ -87,7 +87,7 @@ class SelectionHelper : public MarkHandleProvider { public: static bool findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ); static bool findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject @@ -95,15 +95,15 @@ public: static SdrObject* getMarkHandlesObject( SdrObject* pObj ); static E3dScene* getSceneToRotate( SdrObject* pObj ); static bool isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ); - static ::rtl::OUString getHitObjectCID( + static OUString getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall=false ); - static bool isRotateableObject( const ::rtl::OUString& rCID + static bool isRotateableObject( const OUString& rCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 49c94d5b129d..1e7adfd522d4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -83,7 +83,7 @@ void ShapeController::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) +FeatureState ShapeController::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; @@ -150,7 +150,7 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void ShapeController::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject() SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject(); if ( pSelectedObj ) { - rtl::OUString aName = pSelectedObj->GetName(); + OUString aName = pSelectedObj->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 268f94e3e1a1..ff3b5a0afc6b 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -55,10 +55,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index f3107688f053..4c5d70df90c8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -56,7 +56,7 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t return aSupported; } -::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() ); } @@ -198,7 +198,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even { continue; } - ::rtl::OUString aCmd = rTb.GetItemCommand( nId ); + OUString aCmd = rTb.GetItemCommand( nId ); if ( aCmd == Event.FeatureURL.Complete ) { rTb.EnableItem( nId, Event.IsEnabled ); @@ -208,7 +208,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even } else { - ::rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) { rTb.SetItemText( nId, aItemText ); @@ -246,7 +246,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno m_nSlotId == SID_DRAWTBX_CS_STAR ); } -::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -255,10 +255,10 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno { return xSub->getSubToolbarName(); } - return ::rtl::OUString(); + return OUString(); } -void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) +void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 97390e9954db..c8c7d83e1fd8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -61,15 +61,15 @@ public: virtual void SAL_CALL release() throw (); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // needed by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -82,8 +82,8 @@ public: // ::com::sun::star::frame::XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 55da8a8bf1e1..db7cfc9be370 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index bfabd3d785de..39fef92a8ced 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -79,7 +79,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XSelectionChangeListener ____ diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 7aca7704be7e..e27276cf18d0 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace chart { @@ -87,7 +86,7 @@ void SAL_CALL UndoElement::disposing() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) { return m_sActionString; } @@ -133,10 +132,10 @@ ShapeUndoElement::~ShapeUndoElement() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } @@ -144,7 +143,7 @@ ShapeUndoElement::~ShapeUndoElement() void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Undo(); } @@ -152,7 +151,7 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Redo(); } diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index cda2b656b1e5..7f3687abdfa0 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -63,13 +63,13 @@ public: is the cloned model from before the changes, which the Undo action represents, have been applied. Upon <member>invoking</member>, the clone model is applied to the document model. */ - UndoElement( const ::rtl::OUString & i_actionString, + UndoElement( const OUString & i_actionString, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ private: void impl_toggleModelState(); private: - ::rtl::OUString m_sActionString; + OUString m_sActionString; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel; ::boost::shared_ptr< ChartModelClone > m_pModelClone; }; @@ -98,7 +98,7 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 27d23d137a44..5d059915da4d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index f0b9ae769978..88a727521ed1 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -59,7 +59,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); private: diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index ac3be8abca98..01727c88b4a7 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index 85d6923b7eaa..755f38ff85bd 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -38,7 +38,7 @@ class UndoGuard { public: explicit UndoGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, const ModelFacet i_facet = E_MODEL ); @@ -58,7 +58,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; ::boost::shared_ptr< ChartModelClone > m_pDocumentSnapshot; - rtl::OUString m_aUndoString; + OUString m_aUndoString; bool m_bActionPosted; }; @@ -69,7 +69,7 @@ class UndoLiveUpdateGuard : public UndoGuard { public: explicit UndoLiveUpdateGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuard(); @@ -83,7 +83,7 @@ class UndoLiveUpdateGuardWithData : { public: explicit UndoLiveUpdateGuardWithData( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuardWithData(); @@ -93,7 +93,7 @@ class UndoGuardWithSelection : public UndoGuard { public: explicit UndoGuardWithSelection( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); virtual ~UndoGuardWithSelection(); |