diff options
Diffstat (limited to 'chart2/source/controller/main')
55 files changed, 211 insertions, 213 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index bf8afc65e78f..744727fab528 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,8 +181,8 @@ ChartController::TheModel::~TheModel() void ChartController::TheModel::SetOwnerShip( sal_Bool bGetsOwnership ) { - m_bOwnership = bGetsOwnership; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = bGetsOwnership; + m_bOwnershipIsWellKnown = sal_True; } void ChartController::TheModel::addListener( ChartController* pController ) @@ -234,8 +234,8 @@ void ChartController::TheModel::tryTermination() //so stop listening before trying to terminate or check the source of queryclosing event m_xCloseable->close(sal_True); - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; } catch( util::CloseVetoException& ) { @@ -247,8 +247,8 @@ void ChartController::TheModel::tryTermination() "INFO: a well known owner has catched a CloseVetoException after calling close(true)" ); #endif - m_bOwnership = false; - m_bOwnershipIsWellKnown = sal_True; + m_bOwnership = false; + m_bOwnershipIsWellKnown = sal_True; return; } @@ -365,7 +365,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT throw(uno::RuntimeException) { ::vos::OGuard aGuard( Application::GetSolarMutex()); - + if( impl_isDisposedOrSuspended() ) //@todo? allow attaching the frame while suspended? return; //behave passive if already disposed or suspended @@ -411,7 +411,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT } { awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) ); - + // calls to VCL ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); m_pChartWindow = new ChartWindow(this,pParent,pParent?pParent->GetStyle():0); @@ -557,7 +557,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent aOldModelRef->removeListener( this ); //@todo?? termination correct? -// aOldModelRef->tryTermination(); +// aOldModelRef->tryTermination(); #ifdef TEST_ENABLE_MODIFY_LISTENER uno::Reference< util::XModifyBroadcaster > xMBroadcaster( aOldModelRef->getModel(),uno::UNO_QUERY ); if( xMBroadcaster.is()) @@ -623,7 +623,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XFrame > SAL_CALL ChartController -::getFrame() throw(uno::RuntimeException) +::getFrame() throw(uno::RuntimeException) { //provides access to owner frame of this controller //return the frame containing this controller @@ -632,7 +632,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } uno::Reference< frame::XModel > SAL_CALL ChartController -::getModel() throw(uno::RuntimeException) +::getModel() throw(uno::RuntimeException) { //provides access to currently attached model //returns the currently attached model @@ -650,7 +650,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent { //provides access to current view status //set of data that can be used to restore the current view status at later time - // by using XController::restoreViewData() + // by using XController::restoreViewData() ::vos::OGuard aGuard( Application::GetSolarMutex()); if( impl_isDisposedOrSuspended() ) @@ -768,7 +768,7 @@ void ChartController::impl_deleteDrawViewController() if( !m_aLifeTimeManager.dispose() ) return; -// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); +// OSL_ENSURE( m_bSuspended, "dispose was called but controller is not suspended" ); this->stopDoubleClickWaiting(); @@ -1070,7 +1070,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) return uno::Reference< frame::XDispatch > (); } - uno::Sequence<uno::Reference<frame::XDispatch > > ChartController + uno::Sequence<uno::Reference<frame::XDispatch > > ChartController ::queryDispatches( const uno::Sequence< frame::DispatchDescriptor>& xDescripts) throw(uno::RuntimeException) @@ -1275,12 +1275,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: add listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); -// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? -// return; //behave passive if already disposed or suspended +// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? +// return; //behave passive if already disposed or suspended -// //--add listener -// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); +// //--add listener +// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl ); } void SAL_CALL ChartController @@ -1289,12 +1289,12 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { // // TODO: remove listener by URL ! -// ::vos::OGuard aGuard( Application::GetSolarMutex()); +// ::vos::OGuard aGuard( Application::GetSolarMutex()); // if( m_aLifeTimeManager.impl_isDisposed() ) -// return; //behave passive if already disposed or suspended +// return; //behave passive if already disposed or suspended -// //--remove listener -// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); +// //--remove listener +// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl ); } //----------------------------------------------------------------- @@ -1435,7 +1435,7 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) // the source can also be a subobject of the ChartModel // @todo: change the source in ChartModel to always be the model itself ? // if( getModel() == aEvent.Source ) - + //todo? update menu states ? } @@ -1546,7 +1546,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ( C2U("InsertMenuLegend") ) ( C2U("InsertLegend") ) ( C2U("DeleteLegend") ) ( C2U("InsertMenuDataLabels") ) ( C2U("InsertMenuAxes") ) ( C2U("InsertRemoveAxes") ) ( C2U("InsertMenuGrids") ) - ( C2U("InsertSymbol") ) + ( C2U("InsertSymbol") ) ( C2U("InsertTrendlineEquation") ) ( C2U("InsertTrendlineEquationAndR2") ) ( C2U("InsertR2Value") ) ( C2U("DeleteR2Value") ) ( C2U("InsertMenuTrendlines") ) ( C2U("InsertTrendline") ) @@ -1575,7 +1575,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn //context menu - format objects entries ( C2U("FormatWall") ) ( C2U("FormatFloor") ) ( C2U("FormatChartArea") ) ( C2U("FormatLegend") ) - + ( C2U("FormatAxis") ) ( C2U("FormatTitle") ) ( C2U("FormatDataSeries") ) ( C2U("FormatDataPoint") ) ( C2U("ResetAllDataPoints") ) ( C2U("ResetDataPoint") ) diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index f2b64eb7a9c5..c679714d212c 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,16 +139,16 @@ class DrawViewWrapper; class ViewElementListProvider; class ReferenceSizeProvider; -class ChartController : public ::cppu::WeakImplHelper12 < - ::com::sun::star::frame::XController //comprehends XComponent (required interface) - ,::com::sun::star::frame::XDispatchProvider //(required interface) - ,::com::sun::star::view::XSelectionSupplier //(optional interface) - ,::com::sun::star::ui::XContextMenuInterception //(optional interface) - ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) +class ChartController : public ::cppu::WeakImplHelper12 < + ::com::sun::star::frame::XController //comprehends XComponent (required interface) + ,::com::sun::star::frame::XDispatchProvider //(required interface) + ,::com::sun::star::view::XSelectionSupplier //(optional interface) + ,::com::sun::star::ui::XContextMenuInterception //(optional interface) + ,::com::sun::star::util::XCloseListener //(needed for communication with XModel) ,::com::sun::star::lang::XServiceInfo - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::frame::XDispatch ,::com::sun::star::awt::XWindow //this is the Window Controller part of this Controller, that will be given to a Frame via setComponent ,::com::sun::star::lang::XMultiServiceFactory @@ -188,13 +188,13 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException); + getFrame() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException); + getModel() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException); + getViewData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) @@ -208,7 +208,7 @@ public: // ::com::sun::star::lang::XComponent (base of XController) //----------------------------------------------------------------- virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< @@ -244,7 +244,7 @@ public: select( const ::com::sun::star::uno::Any& rSelection ) throw ( com::sun::star::lang::IllegalArgumentException ); - virtual ::com::sun::star::uno::Any SAL_CALL + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -338,7 +338,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException); + setFocus() throw (::com::sun::star::uno::RuntimeException); //---------------- virtual void SAL_CALL @@ -503,7 +503,7 @@ private: void acquire(); void release(); private: - sal_Int32 volatile m_nRefCount; + sal_Int32 volatile m_nRefCount; }; class TheModel : public RefCountable { @@ -513,24 +513,24 @@ private: virtual ~TheModel(); - void SetOwnerShip( sal_Bool bGetsOwnership ); - void addListener( ChartController* pController ); - void removeListener( ChartController* pController ); - void tryTermination(); + void SetOwnerShip( sal_Bool bGetsOwnership ); + void addListener( ChartController* pController ); + void removeListener( ChartController* pController ); + void tryTermination(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel() { return m_xModel;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xCloseable; //the ownership between model and controller is not clear at first //each controller might consider himself as owner of the model first - sal_Bool volatile m_bOwnership; + sal_Bool volatile m_bOwnership; //with a XCloseable::close call and during XCloseListener::queryClosing //the ownership can be regulated more explicit, //if so the ownership is considered to be well known - sal_Bool volatile m_bOwnershipIsWellKnown; + sal_Bool volatile m_bOwnershipIsWellKnown; }; class TheModelRef { @@ -543,31 +543,31 @@ private: sal_Bool is() const; TheModel* operator->() const { return m_pTheModel; } private: - TheModel* m_pTheModel; - mutable ::osl::Mutex& m_rModelMutex; + TheModel* m_pTheModel; + mutable ::osl::Mutex& m_rModelMutex; }; private: - mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; + mutable ::apphelper::LifeTimeManager m_aLifeTimeManager; - mutable ::osl::Mutex m_aControllerMutex; - sal_Bool volatile m_bSuspended; - sal_Bool volatile m_bCanClose; + mutable ::osl::Mutex m_aControllerMutex; + sal_Bool volatile m_bSuspended; + sal_Bool volatile m_bCanClose; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; //model - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - mutable ::osl::Mutex m_aModelMutex; - TheModelRef m_aModel; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + mutable ::osl::Mutex m_aModelMutex; + TheModelRef m_aModel; //view ChartWindow* m_pChartWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; - DrawViewWrapper* m_pDrawViewWrapper; + DrawViewWrapper* m_pDrawViewWrapper; Selection m_aSelection; SdrDragMode m_eDragMode; @@ -596,7 +596,7 @@ private: private: //private methods - sal_Bool impl_isDisposedOrSuspended() const; + sal_Bool impl_isDisposedOrSuspended() const; ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider(); void impl_adaptDataSeriesAutoResize(); @@ -708,7 +708,7 @@ private: ::std::set< ::rtl::OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For - parameters see + parameters see The returned object should not be used directly. Instead a proxy object should use this helper to retrieve its children and add them to its own diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 0248732a63a7..6026345080cb 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 0a7a4057ef9a..b5e3cc04bf97 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -297,7 +297,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() ObjectIdentifier::getSeriesParticleFromCID(m_aSelection.getSelectedCID()), aChildParticle ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); return; } @@ -706,7 +706,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_LABEL )))), m_xUndoManager, getModel() ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); @@ -756,7 +756,7 @@ void ChartController::executeDispatch_ResetDataPoint() { sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( m_aSelection.getSelectedCID() ); xSeries->resetDataPoint( nPointIndex ); - } + } aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 619d308ffad2..0779306832d0 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,13 +86,13 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r switch( eRP ) { - case RP_LT: + case RP_LT: break; case RP_MT: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; + nPosX += ( aOriginalSize.Width - nSizX ) / 2; break; case RP_RT: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; break; case RP_LM: nPosY += ( aOriginalSize.Height - nSizY ) / 2; @@ -113,7 +113,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r nPosY += aOriginalSize.Height - nSizY; break; case RP_RB: - nPosX += aOriginalSize.Width - nSizX; + nPosX += aOriginalSize.Width - nSizX; nPosY += aOriginalSize.Height - nSizY; break; default: @@ -157,7 +157,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ); DBG_ASSERT( pDlg, "Couldn't create SchTransformTabDialog" ); - + if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 649b9cb62f9d..227946cd2d66 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -243,7 +243,7 @@ namespace sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, xSeries, nPointIndex, xDiagram ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( xObjectProperties,uno::Reference< util::XNumberFormatsSupplier >(xChartModel, uno::UNO_QUERY)); - + pItemConverter = new wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, xSeries, rDrawModel.GetItemPool(), rDrawModel, pNumberFormatterWrapper, @@ -355,7 +355,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, nTitleType = TitleHelper::SECONDARY_X_AXIS_TITLE; else if( rDispatchCommand.equals("SecondaryYTitle") ) nTitleType = TitleHelper::SECONDARY_Y_AXIS_TITLE; - + uno::Reference< XTitle > xTitle( TitleHelper::getTitle( nTitleType, xChartModel ) ); return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ); } @@ -373,7 +373,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisY")) { - nDimensionIndex=1; bMainAxis=true; + nDimensionIndex=1; bMainAxis=true; } else if( rDispatchCommand.equals("DiagramAxisZ")) { @@ -385,7 +385,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, } else if( rDispatchCommand.equals("DiagramAxisB")) { - nDimensionIndex=1; bMainAxis=false; + nDimensionIndex=1; bMainAxis=false; } uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); @@ -578,7 +578,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand return rSelectedCID; else return ObjectIdentifier::createDataCurveCID( - ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), + ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ), RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } @@ -627,7 +627,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( rSelectedCID, xChartModel ); return ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel ); } - + } //------------------------------------------------------------------------- // minor grid @@ -723,7 +723,7 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin m_xUndoManager, getModel() ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, false ); - if( bSuccess ) + if( bSuccess ) aUndoGuard.commitAction(); } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index a6e82430d8f6..9e1c003abd10 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() //set fixed current font aSet.Put( SfxBoolItem( FN_PARAM_2, TRUE ) ); //maybe not necessary in future - + Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont(); aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index ffe752f43a7a..5ce82dec7e52 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ bool lcl_deleteDataSeries( ::chart::DataSeriesHelper::deleteSeries( xSeries, xChartType ); ::chart::AxisHelper::hideAxisIfNoDataIsAttached( xAxis, xDiagram ); - + bResult = true; aUndoGuard.commitAction(); } @@ -210,7 +210,7 @@ namespace chart awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); return ::std::auto_ptr< ReferenceSizeProvider >( - new ReferenceSizeProvider( aPageSize, + new ReferenceSizeProvider( aPageSize, Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ))); } @@ -247,7 +247,7 @@ void ChartController::executeDispatch_NewArrangement() // 3d rotation ThreeDHelper::set3DSettingsToDefault( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ) ); - + // legend Reference< beans::XPropertyState > xLegendState( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendState.is()) @@ -827,16 +827,14 @@ bool ChartController::executeDispatch_Delete() else { //remove additional shape - uno::Reference< drawing::XShape > xShape( m_aSelection.getSelectedAdditionalShape() ); - if( xShape.is() ) + impl_ClearSelection(); { - impl_ClearSelection(); + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + if ( m_pDrawViewWrapper ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - if( m_pDrawViewWrapper ) - m_pDrawViewWrapper->UnmarkAll(); + m_pDrawViewWrapper->DeleteMarked(); + bReturn = true; } - bReturn = DrawModelWrapper::removeShape( xShape ); } } return bReturn; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 56908ac4ef79..dfc25bd4bad5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ #include <rtl/math.hxx> #include <svtools/acceleratorexecute.hxx> -#define DRGPIX 2 // Drag MinMove in Pixel +#define DRGPIX 2 // Drag MinMove in Pixel using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -336,7 +336,7 @@ const short HITPIX=2; //hit-tolerance in pixel } void SAL_CALL ChartController -::setFocus() throw (uno::RuntimeException) +::setFocus() throw (uno::RuntimeException) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -620,7 +620,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper ) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if ( MOUSE_LEFT == rMEvt.GetButtons() ) { @@ -654,7 +654,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) if( isDoubleClick(rMEvt) ) //do not change selection if double click return;//double click is handled further in mousebutton up - + SdrHdl* pHitSelectionHdl = 0; //switch from move to resize if handle is hit on a resizeable object if( m_aSelection.isResizeableObjectSelected() ) @@ -697,7 +697,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) m_aSelection.adaptSelectionToNewPos( aMPos, pDrawViewWrapper , rMEvt.IsRight(), m_bWaitingForDoubleClick ); - + if( !m_aSelection.isRotateableObjectSelected( getModel() ) ) { m_eDragMode = SDRDRAG_MOVE; @@ -766,8 +766,8 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt ) pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); } - //?? pDrawViewWrapper->GetPageView()->DragPoly(); - + //?? pDrawViewWrapper->GetPageView()->DragPoly(); + impl_SetMousePointer( rMEvt ); } void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ ) @@ -790,7 +790,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) if(!pWindow || !pDrawViewWrapper) return; - Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); + Point aMPos = pWindow->PixelToLogic(rMEvt.GetPosPixel()); if(pDrawViewWrapper->IsTextEdit()) { @@ -867,7 +867,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::MOVE); if( !bIsMoveOnly && m_aSelection.isResizeableObjectSelected() ) eActionType = ActionDescriptionProvider::RESIZE; - + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( eActionType, @@ -896,13 +896,13 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) { bool bClickedTwiceOnDragableObject = SelectionHelper::isDragableObjectHitTwice( aMPos, m_aSelection.getSelectedCID(), *pDrawViewWrapper ); bool bIsRotateable = m_aSelection.isRotateableObjectSelected( getModel() ); - + //toggel between move and rotate if( bIsRotateable && bClickedTwiceOnDragableObject && SDRDRAG_MOVE==m_eDragMode ) m_eDragMode=SDRDRAG_ROTATE; else m_eDragMode=SDRDRAG_MOVE; - + pDrawViewWrapper->SetDragMode(m_eDragMode); if( !m_bWaitingForDoubleClick && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() ) @@ -1027,7 +1027,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) else { // todo: the context menu should be specified by an xml file in uiconfig - uno::Reference< awt::XPopupMenu > xPopupMenu( + uno::Reference< awt::XPopupMenu > xPopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY ); @@ -1048,7 +1048,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); uno::Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); Reference< chart2::XRegressionCurve > xTrendline( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xCurveCnt ) ); - bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); + bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline ); Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) ); bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true ); bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries ); @@ -1126,7 +1126,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ASSERT_EXCEPTION( ex ); } } - + if( bHasDataLabelsAtSeries ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") ); if( xTrendline.is() ) @@ -1175,9 +1175,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) //if( nIdBeforeDelete != nUniqueId ) xPopupMenu->insertSeparator( -1 ); - + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow")); - uno::Reference< awt::XPopupMenu > xArrangePopupMenu( + uno::Reference< awt::XPopupMenu > xArrangePopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY ); @@ -1225,7 +1225,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) uno::Reference< XTitled > xTitled( xAxis, uno::UNO_QUERY ); if( xTitled.is()) bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0; - + if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") ); if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis ) @@ -1271,12 +1271,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") ); if( !bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); if( bHasLegend ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") ); } //----- - + xPopupMenu->insertSeparator( -1 ); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType")); lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges")); @@ -1510,7 +1510,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) aPos.Y = aPageSize.Height - aSize.Height; if( aPos.Y < 0 ) aPos.Y = 0; - + xShape->setPosition( aPos ); } } @@ -1889,7 +1889,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( pHitSelectionHdl ) { - + Pointer aPointer = m_pDrawViewWrapper->GetPreferedPointer( aMousePos, pWindow, nModifier, bLeftDown ); bool bForceArrowPointer = false; @@ -1934,7 +1934,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if ( m_eDrawMode == CHARTDRAW_INSERT && ( !m_pDrawViewWrapper->IsMarkedHit( aMousePos ) || !m_aSelection.isDragableObjectSelected() ) ) { - PointerStyle ePointerStyle = POINTER_DRAW_RECT; + PointerStyle ePointerStyle = POINTER_DRAW_RECT; SdrObjKind eKind = static_cast< SdrObjKind >( m_pDrawViewWrapper->GetCurrentObjIdentifier() ); switch ( eKind ) { diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 8749ca1bc062..d000b3071e1e 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index 2de9c0c72663..e9d226bcd1bb 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ private: ChartDropTargetHelper(); bool satisfiesPrerequisites() const; - + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index cab3816d5033..ecd8f0422d66 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT { //@todo ? need to add as terminate listener to desktop? - uno::Reference< frame::XModel > xModel; + uno::Reference< frame::XModel > xModel; bool bHaveLoadedModel = false; comphelper::MediaDescriptor aMediaDescriptor(rMediaDescriptor); @@ -118,8 +118,8 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } //create the controller(+XWindow) - uno::Reference< frame::XController > xController = NULL; - uno::Reference< awt::XWindow > xComponentWindow = NULL; + uno::Reference< frame::XController > xController = NULL; + uno::Reference< awt::XWindow > xComponentWindow = NULL; { xController = uno::Reference< frame::XController >( m_xCC->getServiceManager()->createInstanceWithContext( diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 8b6e1e0a3225..60ae0423f650 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,15 +43,15 @@ class ChartFrameLoader : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader , ::com::sun::star::lang::XServiceInfo //comprehends XComponent (required interface) - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper + // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) + // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; - sal_Bool m_bCancelRequired; - ::osl::Condition m_oCancelFinished; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + sal_Bool m_bCancelRequired; + ::osl::Condition m_oCancelFinished; private: sal_Bool impl_checkCancel(); @@ -81,7 +81,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException); + cancel() throw (::com::sun::star::uno::RuntimeException); }; //............................................................................. diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx index 3419f7a53bec..a5fdde5c08a1 100644 --- a/chart2/source/controller/main/ChartRenderer.cxx +++ b/chart2/source/controller/main/ChartRenderer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject // get the chart view Reference< lang::XUnoTunnel > xChartView( xFact->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); - + try { //better performance for big data @@ -121,7 +121,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject return false; ::boost::shared_ptr< DrawViewWrapper > pDrawViewWrapper( new DrawViewWrapper(&pDrawModelWrapper->getSdrModel(),pOutDev,false) ); pDrawViewWrapper->attachParentReferenceDevice( xModel ); - + MapMode aOldMapMode( pOutDev->GetMapMode() ); Point aOldOrigin( aOldMapMode.GetOrigin() ); MapMode aMapMode( aOldMapMode ); @@ -130,7 +130,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject aMapMode.SetOrigin( aOldOriginMM + aObjectTopLeftMM ); aMapMode.SetMapUnit( MAP_100TH_MM ); pOutDev->SetMapMode(aMapMode); - + Rectangle aPaintRect( OutputDevice::LogicToLogic( rLogicObjectRect, aOldMapMode, aMapMode ) ); pDrawViewWrapper->CompleteRedraw(pOutDev, Region(aPaintRect) ); diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 80041d4c3818..1ab1bc2999b0 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index 401f43c6d1ae..667b137abf89 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 240b615cf0f6..1f077b301948 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 2325d6be7803..812dc2438a80 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index bd040fce8fff..d527d7e52ac7 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 08140786ac4e..488cb6edcd39 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index e0d689340760..019d6b8392ba 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ void CommandDispatchContainer::setModel( { // remove all existing dispatcher that base on the old model m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xModel = xModel; } @@ -174,7 +174,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche void CommandDispatchContainer::DisposeAndClear() { m_aCachedDispatches.clear(); - DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); + DisposeHelper::DisposeAllElements( m_aToBeDisposedDispatches ); m_aToBeDisposedDispatches.clear(); m_xChartDispatcher.clear(); m_aChartCommands.clear(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 1c8769e0a6d9..32b136cd8fb2 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index bf0bc6e14eec..60258054762d 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index a01b80bfa22b..c62de3dfe211 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 08d57a0d6cbf..943a3e760fa8 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 11ba7b7b8016..c61339272ac6 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index dfd5cfa20255..e298cb384b88 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 5074147fa9e2..d5f6d1f68ffa 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt) m_fAdditionalOffset = -m_fInitialOffset; else if( m_fAdditionalOffset > (1.0-m_fInitialOffset) ) m_fAdditionalOffset = 1.0 - m_fInitialOffset; - + B2DVector aNewPosVector = m_aStartVector + (m_aDragDirection * m_fAdditionalOffset); Point aNewPos = Point( (long)(aNewPosVector.getX()), (long)(aNewPosVector.getY()) ); if( aNewPos != DragStat().GetNow() ) diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index f63af9be3cc4..5e52749abd8c 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 944b44dd25bf..56d089481021 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_chart2.hxx" #include "DragMethod_RotateDiagram.hxx" @@ -94,11 +94,11 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr { ThreeDHelper::getRotationFromDiagram( xDiagramProperties , m_nInitialHorizontalAngleDegree, m_nInitialVerticalAngleDegree ); - + ThreeDHelper::getRotationAngleFromDiagram( xDiagramProperties , m_fInitialXAngleRad, m_fInitialYAngleRad, m_fInitialZAngleRad ); - - if( ChartTypeHelper::isSupportingRightAngledAxes( + + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) xDiagramProperties->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; if(m_bRightAngledAxes) @@ -213,7 +213,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY ); aCurrentTransform.shearXY(fResultY,-(fResultX)); } - + if(m_aWireframePolyPolygon.count() && m_pScene) { const sdr::contact::ViewContactOfE3dScene& rVCScene = static_cast< sdr::contact::ViewContactOfE3dScene& >(m_pScene->GetViewContact()); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index b16e12fe5359..ba9ed1125f34 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public: DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper , const rtl::OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , RotationDirection eRotationDirection + , RotationDirection eRotationDirection ); virtual ~DragMethod_RotateDiagram(); @@ -67,7 +67,7 @@ private: Rectangle m_aReferenceRect; Point m_aStartPos; basegfx::B3DPolyPolygon m_aWireframePolyPolygon; - + double m_fInitialXAngleRad; double m_fInitialYAngleRad; double m_fInitialZAngleRad; @@ -75,7 +75,7 @@ private: double m_fAdditionalXAngleRad; double m_fAdditionalYAngleRad; double m_fAdditionalZAngleRad; - + sal_Int32 m_nInitialHorizontalAngleDegree; sal_Int32 m_nInitialVerticalAngleDegree; diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index aa28028c4861..cd893672adf4 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -398,7 +398,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen const beans::PropertyValue* pKeyModifier = ::std::find_if( pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) ); sal_Int16 nKeyModifier = 0; - if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) + if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) { if ( eDrawMode == CHARTDRAW_INSERT ) { diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc index 4e31fafaaf63..66a729498d71 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 38c886e29abb..a1e54f01b894 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 3b41fd1b6b66..210a26294aa1 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); aSelectedCID = aSelectedOID.getObjectCID(); } - + Reference< chart2::XChartDocument > xChartDoc( xChartController->getModel(), uno::UNO_QUERY ); ObjectType eType( aSelectedOID.getObjectType() ); bool bAddSelectionToList = false; @@ -318,7 +318,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } // ----------------------------------------------------------------------------- -uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) +uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xItemWindow; diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index d85415d614e2..3110e0ee28bd 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace chart { //............................................................................. - + struct ListBoxEntryData { rtl::OUString UIName; @@ -106,13 +106,13 @@ public: virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); // XToolbarController virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); - + private: //no default constructor ElementSelectorToolbarController(){} private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; }; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 39b4e1d4a171..0dbbc762f15d 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index b3e2a568d3b9..6dd610e0b876 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ protected: the command group of the feature. This is important for configuring the controller UI by the user, see also <type scope="com::sun::star::frame">CommandGroup</type>. */ - void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, + void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, sal_Int16 nGroup = ::com::sun::star::frame::CommandGroup::INTERNAL ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx index 57e8e7315334..c22d54f9cbbe 100644 --- a/chart2/source/controller/main/ImplUndoManager.cxx +++ b/chart2/source/controller/main/ImplUndoManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ImplUndoManager.hxx b/chart2/source/controller/main/ImplUndoManager.hxx index 4dde0bc65719..ad40bf87aeaa 100644 --- a/chart2/source/controller/main/ImplUndoManager.hxx +++ b/chart2/source/controller/main/ImplUndoManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index fe73d15500f5..372b8cfa77e4 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -249,7 +249,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) ); for( sal_Int32 i=0; i<aAxes.getLength(); ++i ) lcl_addAxisTitle( aAxes[i], aTopLevelContainer, xModel ); - + // Diagram aTopLevelContainer.push_back( aDiaOID ); } @@ -339,7 +339,7 @@ void ImplObjectHierarchy::createAxesTree( AxisHelper::getIndicesForAxis( xAxis, xDiagram, nCooSysIndex, nDimensionIndex, nAxisIndex ); if( nAxisIndex>0 && !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, nDimensionIndex ) ) continue; - + if( m_bOrderingForElementSelector ) { // axis diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index f0ce3eaaa04e..b57f1add2018 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 567a36473a5b..1e1e407951de 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ rtl::OUString lcl_getObjectName( SdrObject* pObj ) void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + if(pObjectToSelect) { SelectionHelper aSelectionHelper( pObjectToSelect ); @@ -183,13 +183,13 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* { if( pDrawViewWrapper ) { - //do not toggel multiclick selection if right clicked on the selected object or waiting for double click + //do not toggel multiclick selection if right clicked on the selected object or waiting for double click bool bAllowMultiClickSelectionChange = !bIsRightMouse && !bWaitingForDoubleClick; ObjectIdentifier aLastSelectedObject( m_aSelectedOID ); ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - + //bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point) //get object to select: @@ -452,7 +452,7 @@ 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 - + if( aRet.equals( aWallCID ) ) { rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); @@ -473,7 +473,7 @@ bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID return false; sal_Int32 nDimensionCount = DiagramHelper::getDimension( ChartModelHelper::findDiagram( xChartModel ) ); - + if( nDimensionCount == 3 ) return true; return false; @@ -558,7 +558,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) { //search wether the object or one of its children is a 3D object //if so, return the accessory 3DScene - + E3dObject* pRotateable = 0; if(pObj) @@ -579,7 +579,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj ) } } } - + E3dScene* pScene = 0; if(pRotateable) { diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index b3516e2326a4..a6904cf1af3c 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index b6adf9bf7477..61527c2918d3 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index aea01d6c478d..53436802e9d8 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 9c6ed747e1d5..913c1bf6da61 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -191,7 +191,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments // ::com::sun::star::frame::XStatusListener void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) { @@ -234,7 +234,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); Reference< awt::XWindow > xRet; if ( m_pToolbarController.is() ) @@ -259,7 +259,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno ::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { @@ -272,7 +272,7 @@ void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) { ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); - + uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY ); if ( xSub.is() ) { diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 544cac7f9831..a8bfe954809b 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace chart { //............................................................................. -typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, +typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base; typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::star::frame::XToolbarController > TToolbarHelper; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index d80d37eff7da..00cc9a84417e 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index c84f81f83258..93e1f951c97d 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index eb3d00a2723a..bb6034f882fd 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 28fb813f63de..680be0462a52 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 8513b6ba9093..d26e9adb6ed8 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx index 21e27922b1c8..45e6c3e8b37f 100644 --- a/chart2/source/controller/main/UndoManager.cxx +++ b/chart2/source/controller/main/UndoManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index cf8f5525e624..6dd12e6429a2 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |