diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-28 14:55:43 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 11:34:33 +0000 |
| commit | dd9c97d587d2a295d44e8685d253d30542a2c85a (patch) | |
| tree | 8736a3552ac8c56fc9102a6518072c68295c4a25 /chart2/source/controller/main | |
| parent | 05bd5b46ea659df95fb6f0c895c090629b541e0f (diff) | |
fdo#62475 removed pointless comments
Change-Id: I3f5e86dba2df950aeb12c895f52d99274c0959aa
Reviewed-on: https://gerrit.libreoffice.org/5148
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/controller/main')
43 files changed, 0 insertions, 392 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 4f7a4a1978c4..0ae910b1acaa 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -82,10 +82,8 @@ // react on this by rebuilding the view #define TEST_ENABLE_MODIFY_LISTENER -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; @@ -94,9 +92,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; DBG_NAME(ChartController) -//----------------------------------------------------------------- // ChartController Constructor and Destructor -//----------------------------------------------------------------- ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) : m_aLifeTimeManager( NULL ), @@ -129,8 +125,6 @@ ChartController::~ChartController() stopDoubleClickWaiting(); } -//----------------------------------------------------------------- - ChartController::RefCountable::RefCountable() : m_nRefCount(0) { } @@ -149,8 +143,6 @@ void ChartController::RefCountable::release() delete this; } -//----------------------------------------------------------------- - ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) : m_xModel( xModel ), m_xCloseable( NULL ), @@ -254,8 +246,6 @@ void ChartController::TheModel::tryTermination() } } -//----------------------------------------------------------------- - ChartController::TheModelRef::TheModelRef( TheModel* pTheModel, osl::Mutex& rMutex ) : m_pTheModel(pTheModel), m_rModelMutex(rMutex) @@ -308,10 +298,7 @@ sal_Bool ChartController::TheModelRef::is() const return (m_pTheModel != 0); } - -//----------------------------------------------------------------- // private methods -//----------------------------------------------------------------- sal_Bool ChartController::impl_isDisposedOrSuspended() const { @@ -326,9 +313,7 @@ sal_Bool ChartController::impl_isDisposedOrSuspended() const return sal_False; } -//----------------------------------------------------------------- // lang::XServiceInfo -//----------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME) @@ -341,9 +326,7 @@ uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() return aSNS; } -//----------------------------------------------------------------- // XController -//----------------------------------------------------------------- void SAL_CALL ChartController::attachFrame( const uno::Reference<frame::XFrame>& xFrame ) @@ -372,9 +355,6 @@ void SAL_CALL ChartController::attachFrame( //@todo nothing right??? - - - //-------------------------------------------------- //create view @todo is this the correct place here?? Window* pParent = NULL; @@ -694,7 +674,6 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) return sal_True; } - void ChartController::impl_createDrawViewController() { SolarMutexGuard aGuard; @@ -719,9 +698,7 @@ void ChartController::impl_deleteDrawViewController() } } -//----------------------------------------------------------------- // XComponent (base of XController) -//----------------------------------------------------------------- void SAL_CALL ChartController::dispose() throw(uno::RuntimeException) @@ -847,10 +824,7 @@ void SAL_CALL ChartController::removeEventListener( m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener ); } - -//----------------------------------------------------------------- // util::XCloseListener -//----------------------------------------------------------------- void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) @@ -932,9 +906,7 @@ bool ChartController::impl_releaseThisModel( return bReleaseModel; } -//----------------------------------------------------------------- // util::XEventListener (base of XCloseListener) -//----------------------------------------------------------------- void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) throw(uno::RuntimeException) @@ -963,10 +935,7 @@ void SAL_CALL ChartController::layoutEvent( } } - -//----------------------------------------------------------------- // XDispatchProvider (required interface) -//----------------------------------------------------------------- namespace { @@ -1056,9 +1025,7 @@ uno::Sequence<uno::Reference<frame::XDispatch > > return uno::Sequence<uno::Reference<frame::XDispatch > > (); } -//----------------------------------------------------------------- // frame::XDispatch -//----------------------------------------------------------------- void SAL_CALL ChartController::dispatch( const util::URL& rURL, @@ -1076,7 +1043,6 @@ void SAL_CALL ChartController::dispatch( this->executeDispatch_Cut(); else if(aCommand == "DataRanges" ) this->executeDispatch_SourceData(); - //---------------------------------- else if(aCommand == "Update" ) //Update Chart { ChartViewHelper::setViewToDirtyState( getModel() ); @@ -1261,9 +1227,7 @@ void SAL_CALL ChartController::removeStatusListener( //@todo } -//----------------------------------------------------------------- // XContextMenuInterception (optional interface) -//----------------------------------------------------------------- void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) throw(uno::RuntimeException) @@ -1281,10 +1245,6 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor( // ____ XEmbeddedClient ____ // implementation see: ChartController_EditData.cxx -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_ChartType() { // using assignment for broken gcc 3.3 @@ -1388,8 +1348,6 @@ void SAL_CALL ChartController::modified( //todo? update menu states ? } -//----------------------------------------------------------------------------- - IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction ) { ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L ); @@ -1557,8 +1515,6 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 442fa8e7dda0..7d644e55ad87 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -59,7 +59,6 @@ #include <boost/shared_ptr.hpp> #include <set> - class SdrModel; namespace svt @@ -75,11 +74,8 @@ namespace graphic { } }}} - -//............................................................................. namespace chart { -//............................................................................. class UndoGuard; @@ -160,16 +156,12 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext); virtual ~ChartController(); - //----------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo - //----------------------------------------------------------------- APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartController) - //----------------------------------------------------------------- // ::com::sun::star::frame::XController (required interface) - //----------------------------------------------------------------- virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) @@ -197,9 +189,7 @@ public: suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang::XComponent (base of XController) - //----------------------------------------------------------------- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); @@ -213,9 +203,7 @@ public: ::com::sun::star::lang::XEventListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XDispatchProvider (required interface) - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> SAL_CALL queryDispatch( const ::com::sun::star::util::URL& rURL @@ -230,9 +218,7 @@ public: ::com::sun::star::frame::DispatchDescriptor > & xDescripts) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::view::XSelectionSupplier (optional interface) - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& rSelection ) throw ( com::sun::star::lang::IllegalArgumentException ); @@ -250,9 +236,7 @@ public: com::sun::star::view::XSelectionChangeListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::ui::XContextMenuInterception (optional interface) - //----------------------------------------------------------------- virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) @@ -263,14 +247,9 @@ public: ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) throw (::com::sun::star::uno::RuntimeException); - - //----------------------------------------------------------------- - //----------------------------------------------------------------- //additional interfaces - //----------------------------------------------------------------- // ::com::sun::star::util::XCloseListener - //----------------------------------------------------------------- virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source , sal_Bool GetsOwnership ) @@ -281,16 +260,12 @@ public: notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------- // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) - //------------------------------------------------------------------------------------- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XDispatch - //----------------------------------------------------------------- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL @@ -310,9 +285,7 @@ public: , const ::com::sun::star::util::URL& aURL ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::awt::XWindow - //----------------------------------------------------------------- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) @@ -333,7 +306,6 @@ public: virtual void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException); - //---------------- virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) @@ -394,9 +366,7 @@ public: ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang XMultiServiceFactory - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, @@ -411,32 +381,24 @@ public: getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifyListener - //----------------------------------------------------------------- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModeChangeListener - //----------------------------------------------------------------- virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XLayoutManagerListener - //----------------------------------------------------------------- virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // chart2::WindowController - //----------------------------------------------------------------- virtual void PrePaint(); virtual void execute_Paint( const Rectangle& rRect ); virtual void execute_MouseButtonDown( const MouseEvent& rMEvt ); @@ -457,9 +419,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - //----------------------------------------------------------------- - //----------------------------------------------------------------- - static bool isObjectDeleteable( const ::com::sun::star::uno::Any& rSelection ); void setDrawMode( ChartDrawMode eMode ) { m_eDrawMode = eMode; } @@ -470,16 +429,7 @@ public: DECL_LINK( NotifyUndoActionHdl, SdrUndoAction* ); public: - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- //private - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - private: DrawModelWrapper* GetDrawModelWrapper(); @@ -722,9 +672,7 @@ private: void impl_switchDiagramPositioningToExcludingPositioning(); }; -//............................................................................. } // namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index d7bc61d64ae4..ee1498c48114 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -55,8 +55,6 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <svx/ActionDescriptionProvider.hxx> -//-------------------------------------- - // header for define RET_OK #include <vcl/msgbox.hxx> // header for class OUStringBuffer @@ -66,14 +64,11 @@ // header for class ::vos::OGuard #include <osl/mutex.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. - namespace { struct lcl_InsertMeanValueLine @@ -100,10 +95,8 @@ private: } // anonymous namespace -//............................................................................. namespace chart { -//............................................................................. void ChartController::executeDispatch_InsertAxes() { @@ -177,9 +170,6 @@ void ChartController::executeDispatch_InsertGrid() } } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( @@ -261,9 +251,6 @@ void ChartController::executeDispatch_OpenLegendDialog() } } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::executeDispatch_InsertMenu_DataLabels() { UndoGuard aUndoGuard( @@ -890,8 +877,6 @@ void ChartController::executeDispatch_DeleteMinorGrid() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index b0c56b81fe26..752495f7b54e 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -42,16 +42,11 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectangle& rPosAndSize, const awt::Size aOriginalSize ) { long nPosX(0); @@ -150,7 +145,6 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ); OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" ); - if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); @@ -181,8 +175,6 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 09c24ea36475..f1a64789de63 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -62,10 +62,8 @@ #include <osl/mutex.hxx> #include <svx/ActionDescriptionProvider.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -86,7 +84,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH { ::comphelper::ItemConverter* pItemConverter=NULL; - //------------------------------------------------------------- //get type of selected object ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID ); if( OBJECTTYPE_UNKNOWN==eObjectType ) @@ -97,7 +94,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS"; - //------------------------------------------------------------- if( !bAffectsMultipleObjects ) { uno::Reference< beans::XPropertySet > xObjectProperties = @@ -435,14 +431,12 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rSelectedCID, xChartModel ); uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt( xSeries, uno::UNO_QUERY ); - //------------------------------------------------------------------------- //legend if( rDispatchCommand.equals("Legend") || rDispatchCommand.equals("FormatLegend") ) { eObjectType = OBJECTTYPE_LEGEND; //@todo set particular aParticleID if we have more than one legend } - //------------------------------------------------------------------------- //wall floor area else if( rDispatchCommand.equals("DiagramWall") || rDispatchCommand.equals("FormatWall") ) { @@ -459,7 +453,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { eObjectType = OBJECTTYPE_PAGE; } - //------------------------------------------------------------------------- //title else if( rDispatchCommand.equals("MainTitle") || rDispatchCommand.equals("SubTitle") @@ -473,7 +466,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getTitleCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //axis else if( rDispatchCommand.equals("DiagramAxisX") || rDispatchCommand.equals("DiagramAxisY") @@ -485,7 +477,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getAxisCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //grid else if( rDispatchCommand.equals("DiagramGridYMain") || rDispatchCommand.equals("DiagramGridXMain") @@ -498,7 +489,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getGridCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //data series else if( rDispatchCommand.equals("FormatDataSeries") ) { @@ -508,13 +498,11 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_SERIES, ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ) ); } - //------------------------------------------------------------------------- //data point else if( rDispatchCommand.equals("FormatDataPoint") ) { return rSelectedCID; } - //------------------------------------------------------------------------- //data labels else if( rDispatchCommand.equals("FormatDataLabels") ) { @@ -524,7 +512,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID ); } - //------------------------------------------------------------------------- //data labels else if( rDispatchCommand.equals("FormatDataLabel") ) { @@ -545,7 +532,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } } - //------------------------------------------------------------------------- //mean value line else if( rDispatchCommand.equals("FormatMeanValue") ) { @@ -557,7 +543,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getMeanValueLine( xRegCurveCnt ) ), true ); } - //------------------------------------------------------------------------- //trend line else if( rDispatchCommand.equals("FormatTrendline") ) { @@ -569,7 +554,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } - //------------------------------------------------------------------------- //trend line equation else if( rDispatchCommand.equals("FormatTrendlineEquation") ) { @@ -581,19 +565,16 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ) ); } - //------------------------------------------------------------------------- // y error bars else if( rDispatchCommand.equals("FormatXErrorBars") ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_X, eSelectedType, rSelectedCID ); } - //------------------------------------------------------------------------- // y error bars else if( rDispatchCommand.equals("FormatYErrorBars") ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_Y, eSelectedType, rSelectedCID ); } - //------------------------------------------------------------------------- // axis else if( rDispatchCommand.equals("FormatAxis") ) { @@ -605,7 +586,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis , xChartModel ); } } - //------------------------------------------------------------------------- // major grid else if( rDispatchCommand.equals("FormatMajorGrid") ) { @@ -618,7 +598,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } - //------------------------------------------------------------------------- // minor grid else if( rDispatchCommand.equals("FormatMinorGrid") ) { @@ -630,14 +609,12 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, 0 /*sub grid index*/ ); } } - //------------------------------------------------------------------------- // title else if( rDispatchCommand.equals("FormatTitle") ) { if( eSelectedType == OBJECTTYPE_TITLE ) return rSelectedCID; } - //------------------------------------------------------------------------- // stock loss else if( rDispatchCommand.equals("FormatStockLoss") ) { @@ -646,7 +623,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: else return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, OUString()); } - //------------------------------------------------------------------------- // stock gain else if( rDispatchCommand.equals("FormatStockGain") ) { @@ -726,7 +702,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri } try { - //------------------------------------------------------------- //get type of object ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); if( OBJECTTYPE_UNKNOWN==eObjectType ) @@ -739,7 +714,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri return bRet; } - //------------------------------------------------------------- //convert properties to ItemSet SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -761,7 +735,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri apItemConverter->FillItemSet( aItemSet ); - //------------------------------------------------------------- //prepare dialog ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter( rObjectCID ); aDialogParameter.init( getModel() ); @@ -797,7 +770,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(), m_xChartView, rObjectCID ) ); } - //------------------------------------------------------------- //open the dialog if( aDlg.Execute() == RET_OK || (bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso && aDlg.DialogWasClosedWithOK()) ) { @@ -840,8 +812,6 @@ void SAL_CALL ChartController::executeDispatch_View3D() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 1db54ebadefd..b64c65c53da3 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -45,23 +45,15 @@ #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixel ) { this->StartTextEdit( pMousePixel ); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::StartTextEdit( const Point* pMousePixel ) { //the first marked object will be edited @@ -156,9 +148,6 @@ bool ChartController::EndTextEdit() return true; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() { SolarMutexGuard aGuard; @@ -229,9 +218,6 @@ uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > return xResult; } - -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index cd25717fcaf5..bfe6fc1535bd 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartController.hxx" #include "ChartWindow.hxx" #include "ChartModelHelper.hxx" @@ -943,7 +942,6 @@ void ChartController::executeDispatch_ToggleGridVertical() } } - void ChartController::impl_ShapeControllerDispatch( const util::URL& rURL, const Sequence< beans::PropertyValue >& rArgs ) { Reference< frame::XDispatch > xDispatch( m_aDispatchContainer.getShapeController() ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 0dd17f619f0d..cb99f8ec70e4 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -83,10 +83,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -225,9 +223,7 @@ OUString lcl_getFormatCommandForObjectCID( const OUString& rCID ) const short HITPIX=2; //hit-tolerance in pixel -//----------------------------------------------------------------- // awt::XWindow -//----------------------------------------------------------------- void SAL_CALL ChartController::setPosSize( sal_Int32 X, sal_Int32 Y, @@ -469,9 +465,7 @@ void SAL_CALL ChartController::removePaintListener( xWindow->removePaintListener( xListener ); } -//----------------------------------------------------------------- // impl vcl window controller methods -//----------------------------------------------------------------- void ChartController::PrePaint() { // forward VCLs PrePaint window event to DrawingLayer @@ -535,10 +529,6 @@ bool isDoubleClick( const MouseEvent& rMEvt ) !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsShift(); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::startDoubleClickWaiting() { SolarMutexGuard aGuard; @@ -585,8 +575,6 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) return 0; } -//------------------------------------------------------------------------ - void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) { SolarMutexGuard aGuard; @@ -1599,9 +1587,7 @@ bool ChartController::requestQuickHelp( return bResult; } -//----------------------------------------------------------------- // XSelectionSupplier (optional interface) -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartController ::select( const uno::Any& rSelection ) throw( lang::IllegalArgumentException ) @@ -2019,8 +2005,6 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index c15b9d2b6014..154db84f5955 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartDropTargetHelper.hxx" #include "DiagramHelper.hxx" #include "DataSourceHelper.hxx" diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index ddf5e916f797..f9ca3834050b 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -50,7 +50,6 @@ private: 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 2e2713ba3b67..8c1c609dcdff 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -26,10 +26,8 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/frame/XLoadable.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; @@ -56,9 +54,7 @@ ChartFrameLoader::~ChartFrameLoader() return sal_False; } -//----------------------------------------------------------------- // lang::XServiceInfo -//----------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) @@ -70,9 +66,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT return aSNS; } -//----------------------------------------------------------------- // frame::XFrameLoader -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartFrameLoader ::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor @@ -125,7 +119,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT return sal_False; } - //connect frame, controller and model one to each other: if(xController.is()&&xModel.is()) { @@ -193,8 +186,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT m_bCancelRequired = sal_False; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 54344e7153d9..8ea4ff1e2b16 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -26,10 +26,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> -//............................................................................. namespace chart { -//............................................................................. class ChartFrameLoader : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader @@ -54,16 +52,12 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext); virtual ~ChartFrameLoader(); - //----------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo - //----------------------------------------------------------------- APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartFrameLoader) - //----------------------------------------------------------------- // ::com::sun::star::frame::XFrameLoader - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL load( const ::com::sun::star::uno::Sequence< @@ -76,9 +70,7 @@ public: cancel() throw (::com::sun::star::uno::RuntimeException); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index d9bda071e8fe..f8ae21852ef8 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartModelClone.hxx" #include "ChartModelHelper.hxx" #include "ControllerLockGuard.hxx" @@ -36,10 +35,8 @@ #include <comphelper/property.hxx> #include <tools/diagnose_ex.h> -//...................................................................................................................... namespace chart { -//...................................................................................................................... using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -64,9 +61,7 @@ namespace chart using ::com::sun::star::chart2::data::XDataSource; using ::com::sun::star::chart2::data::XLabeledDataSequence; - // ================================================================================================================= // = helper - // ================================================================================================================= namespace { Reference< XModel > lcl_cloneModel( const Reference< XModel > & xModel ) @@ -86,10 +81,7 @@ namespace chart } - // ================================================================================================================= // = ChartModelClone - // ================================================================================================================= - // ----------------------------------------------------------------------------------------------------------------- ChartModelClone::ChartModelClone( const Reference< XModel >& i_model, const ModelFacet i_facet ) { m_xModelClone.set( lcl_cloneModel( i_model ) ); @@ -117,15 +109,12 @@ namespace chart } } - - // ----------------------------------------------------------------------------------------------------------------- ChartModelClone::~ChartModelClone() { if ( !impl_isDisposed() ) dispose(); } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::dispose() { if ( impl_isDisposed() ) @@ -145,7 +134,6 @@ namespace chart m_aSelection.clear(); } - // ----------------------------------------------------------------------------------------------------------------- ModelFacet ChartModelClone::getFacet() const { if ( m_aSelection.hasValue() ) @@ -155,7 +143,6 @@ namespace chart return E_MODEL; } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::applyToModel( const Reference< XModel >& i_model ) const { applyModelContentToModel( i_model, m_xModelClone, m_xDataClone ); @@ -174,7 +161,6 @@ namespace chart } } - // ----------------------------------------------------------------------------------------------------------------- namespace { void ImplApplyDataToModel( const Reference< XModel >& i_model, const Reference< XInternalDataProvider > & i_data ) @@ -197,7 +183,6 @@ namespace chart } } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::applyModelContentToModel( const Reference< XModel >& i_model, const Reference< XModel >& i_modelToCopyFrom, const Reference< XInternalDataProvider >& i_data ) { @@ -262,9 +247,6 @@ namespace chart } } - -//...................................................................................................................... } // namespace chart -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx index a4af3d25b0f9..5aaf53f500d3 100644 --- a/chart2/source/controller/main/ChartModelClone.hxx +++ b/chart2/source/controller/main/ChartModelClone.hxx @@ -25,14 +25,10 @@ #include <boost/noncopyable.hpp> -//...................................................................................................................... namespace chart { -//...................................................................................................................... - //================================================================================================================== //= ModelFacet - //================================================================================================================== enum ModelFacet { E_MODEL, @@ -40,9 +36,7 @@ namespace chart E_MODEL_WITH_SELECTION }; - //================================================================================================================== //= ChartModelClone - //================================================================================================================== class ChartModelClone : public ::boost::noncopyable { public: @@ -73,9 +67,7 @@ namespace chart ::com::sun::star::uno::Any m_aSelection; }; -//...................................................................................................................... } // namespace chart -//...................................................................................................................... #endif // CHART2_CHARTMODELCLONE_HXX diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 7e6360509136..6761c4838bb5 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartTransferable.hxx" #include <unotools/streamwrap.hxx> diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 69a0125d6216..e103b56ba595 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -38,11 +38,8 @@ namespace } } // anonymous namespace - -//............................................................................. namespace chart { -//............................................................................. ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, WinBits nStyle ) : Window(pParent, nStyle) @@ -256,8 +253,6 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) ::Window::Invalidate( rRegion, nFlags ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index c04ddbe00b23..f943962d9d25 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -21,15 +21,11 @@ #include <vcl/window.hxx> -//............................................................................. namespace chart { -//............................................................................. - class WindowController; -//----------------------------------------------------------------------------- /** The ChartWindow collects events from the window and forwards them the to the controller thus the controller can perform appropriate actions */ @@ -73,9 +69,7 @@ private: void adjustHighContrastMode(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 2c547fba4c04..cee92934ece5 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CommandDispatch.hxx" #include "CommonFunctors.hxx" #include "macros.hxx" @@ -189,8 +188,6 @@ void CommandDispatch::fireStatusEventForURL( } } - - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 483fedf4d9d3..7c6e72d6bcf2 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CommandDispatchContainer.hxx" #include "UndoCommandDispatch.hxx" #include "StatusBarCommandDispatch.hxx" diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 31a088120f35..20a5df87286f 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationAccess.hxx" #include "macros.hxx" @@ -28,11 +27,8 @@ // header for rtl::Static #include <rtl/instance.hxx> - -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -47,8 +43,6 @@ bool lcl_IsMetric() } }//end anonymous namespace -// ---------------------------------------- - class CalcConfigItem : public ::utl::ConfigItem { public: @@ -105,8 +99,6 @@ namespace ConfigurationAccess } } //namespace ConfigurationAccess -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 10227164a800..85df6635cb1a 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ControllerCommandDispatch.hxx" #include "ChartModelHelper.hxx" #include "DiagramHelper.hxx" @@ -75,8 +74,6 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController namespace chart { -// ---------------------------------------- - namespace impl { @@ -139,7 +136,6 @@ struct ControllerState bool bMayFormatYErrorBars; }; - ControllerState::ControllerState() : bHasSelectedObject( false ), bIsPositionableObject( false ), @@ -307,7 +303,6 @@ void ControllerState::update( } } - /** Represents the current state of the model. You can set the state by calling update(). After this call the state is @@ -461,7 +456,6 @@ bool ModelState::HasAnyTitle() const } // namespace impl -// ---------------------------------------- DBG_NAME(ControllerCommandDispatch) ControllerCommandDispatch::ControllerCommandDispatch( @@ -800,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve CommandDispatch::modified( aEvent ); } - // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 2724551354a3..9072a90556e3 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DragMethod_Base.hxx" #include "Strings.hrc" @@ -31,10 +30,8 @@ #include <svx/ActionDescriptionProvider.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -78,8 +75,6 @@ Pointer DragMethod_Base::GetSdrDragPointer() const else return Pointer(POINTER_MOVE); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index abf58cbc149e..3aa1f2a84df5 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DragMethod_PieSegment.hxx" #include "Strings.hrc" @@ -29,10 +28,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -148,8 +145,6 @@ void DragMethod_PieSegment::createSdrDragEntries() addSdrDragEntry(new SdrDragEntryPolyPolygon(aNewPolyPolygon)); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index a983d85ba5b8..14c3a61745b5 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -38,10 +38,8 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -221,8 +219,6 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage addToOverlayObjectList(*pNew); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index c03404fa2d45..0ff2135af9cb 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawCommandDispatch.hxx" #include "DrawCommandDispatch.hrc" #include "ChartController.hxx" @@ -52,11 +51,8 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - -//............................................................................. namespace { -//............................................................................. // comparing two PropertyValue instances struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > @@ -71,15 +67,10 @@ namespace } }; -//............................................................................. } // anonymous namespace -//............................................................................. - -//............................................................................. namespace chart { -//............................................................................. DrawCommandDispatch::DrawCommandDispatch( const Reference< uno::XComponentContext >& rxContext, ChartController* pController ) @@ -659,8 +650,6 @@ bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt return bFound; } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index afa6799ab11c..968caa2fcf49 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -26,10 +26,8 @@ class SfxItemSet; class SdrObject; -//............................................................................. namespace chart { -//............................................................................. class ChartController; @@ -77,9 +75,7 @@ private: OUString m_aCustomShapeType; }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_DRAWCOMMANDDISPATCH_HXX #endif diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 601cf82d9e6b..f892f0b497b0 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ElementSelector.hxx" #include "macros.hxx" #include "ObjectNameProvider.hxx" @@ -51,8 +50,6 @@ namespace static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" ); } -//------------------------------------------------------------------------------ - SelectorListBox::SelectorListBox( Window* pParent, WinBits nStyle ) : ListBox( pParent, nStyle ) , m_bReleaseFocus( true ) @@ -251,23 +248,19 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName ); -//------------------------------------------------------------------------------ Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { Sequence< OUString > aServices(1); aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } -// ----------------------------------------------------------------------------- ElementSelectorToolbarController::ElementSelectorToolbarController( const uno::Reference< uno::XComponentContext > & xContext ) : m_xCC( xContext ) { } -// ----------------------------------------------------------------------------- ElementSelectorToolbarController::~ElementSelectorToolbarController() { } -// ----------------------------------------------------------------------------- // XInterface Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException) { @@ -276,22 +269,18 @@ Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rTyp aReturn = ElementSelectorToolbarController_BASE::queryInterface(_rType); return aReturn; } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::acquire() throw () { ToolboxController::acquire(); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException) { ToolboxController::initialize(rArguments); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) { if( m_apSelectorListBox.get() ) @@ -306,7 +295,6 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } } -// ----------------------------------------------------------------------------- uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) throw (uno::RuntimeException) { @@ -328,8 +316,6 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create return xItemWindow; } -//.......................................................................... } // chart2 -//.......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 025500f9f2ef..e5db87e4d3d5 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -30,10 +30,8 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. struct ListBoxEntryData { @@ -70,9 +68,6 @@ class SelectorListBox : public ListBox bool m_bReleaseFocus; }; -// ------------------------------------------------------------------ -// ------------------------------------------------------------------ - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> ElementSelectorToolbarController_BASE; class ElementSelectorToolbarController : public ::svt::ToolboxController @@ -108,9 +103,7 @@ private: ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index c3b3ce7f5f58..f530700f5372 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FeatureCommandDispatchBase.hxx" using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index ebcb60569747..0a8d00fc1322 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ObjectHierarchy.hxx" #include "ObjectIdentifier.hxx" #include "ChartModelHelper.hxx" @@ -621,7 +620,6 @@ ObjectHierarchy::tOID ImplObjectHierarchy::getParent( } // namespace impl - ObjectHierarchy::ObjectHierarchy( const Reference< XChartDocument > & xChartDocument, ExplicitValueProvider * pExplicitValueProvider /* = 0 */, @@ -691,8 +689,6 @@ sal_Int32 ObjectHierarchy::getIndexInParent( return -1; } -// ================================================================================ - ObjectKeyNavigation::ObjectKeyNavigation( const ObjectHierarchy::tOID & rCurrentOID, const Reference< chart2::XChartDocument > & xChartDocument, diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index fa57560005f7..5e4005a9e7a4 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PositionAndSizeHelper.hxx" #include "macros.hxx" #include "ChartModelHelper.hxx" @@ -32,10 +31,8 @@ #include <tools/gen.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -149,8 +146,6 @@ bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID return moveObject( eObjectType, xObjectProp, aNewPositionAndSize, rPageRectangle ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 950c05df949b..4e118ee37360 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -34,10 +34,8 @@ #include <basegfx/point/b2dpoint.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -334,9 +332,6 @@ bool Selection::isAdditionalShapeSelected() const return m_aSelectedOID.isAdditionalShape(); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject , OUString& rOutName , bool bGivenObjectMayBeResult ) @@ -673,8 +668,6 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 5a4273a7fb2a..8c966474219b 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -27,15 +27,11 @@ class SdrObject; #include <svx/svdtypes.hxx> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. class ObjectIdentifier; -//----------------------------------------------------------------------------- - class Selection { public: //methods @@ -107,11 +103,9 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - SelectionHelper( SdrObject* pSelectedObj ); virtual ~SelectionHelper(); - //MarkHandleProvider: virtual bool getMarkHandles( SdrHdlList& rHdlList ); virtual bool getFrameDragSingles(); @@ -124,9 +118,7 @@ private: SdrObject* m_pMarkObj;//object that is marked instead to have more pretty handles }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 1e7adfd522d4..999177409985 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ShapeController.hxx" #include "ShapeController.hrc" #include "ChartController.hxx" @@ -51,10 +50,8 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. ShapeController::ShapeController( const Reference< uno::XComponentContext >& rxContext, ChartController* pController ) @@ -721,8 +718,6 @@ bool ShapeController::isForwardPossible() return false; } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index ff3b5a0afc6b..8cf724e618cf 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -25,10 +25,8 @@ class AbstractSvxNameDialog; class SdrObject; -//............................................................................. namespace chart { -//............................................................................. class ChartController; @@ -84,9 +82,7 @@ private: ChartController* m_pChartController; }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_SHAPECONTROLLER_HXX #endif diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 7713fbe9045f..695b60cf3090 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ShapeToolbarController.hxx" #include <osl/mutex.hxx> @@ -28,16 +27,13 @@ #include <svx/svxids.hrc> #include <svx/tbxcustomshapes.hxx> - using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException) { @@ -283,8 +279,6 @@ void ShapeToolbarController::updateImage() throw (uno::RuntimeException) } } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index d84155ba0c7a..196958ab9b10 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -30,10 +30,8 @@ class SfxToolBoxControl; -//............................................................................. namespace chart { -//............................................................................. typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base; @@ -87,9 +85,7 @@ public: virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); }; -//............................................................................. } // namespace chart -//............................................................................. #endif //CHART2_SHAPETOOLBARCONTROLLER_HXX diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index db7cfc9be370..94acd29d7045 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "StatusBarCommandDispatch.hxx" #include "ObjectNameProvider.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index e27276cf18d0..9371233c05ea 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoActions.hxx" #include "DisposeHelper.hxx" #include "CommonFunctors.hxx" @@ -37,7 +36,6 @@ using namespace ::com::sun::star; - namespace chart { namespace impl @@ -61,7 +59,6 @@ namespace impl using ::com::sun::star::chart2::XChartDocument; using ::com::sun::star::document::UndoFailedException; -// --------------------------------------------------------------------------------------------------------------------- UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone ) :UndoElement_MBase() ,UndoElement_TBase( m_aMutex ) @@ -71,12 +68,10 @@ UndoElement::UndoElement( const OUString& i_actionString, const Reference< XMode { } -// --------------------------------------------------------------------------------------------------------------------- UndoElement::~UndoElement() { } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::disposing() { if ( !!m_pModelClone ) @@ -85,13 +80,11 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -// --------------------------------------------------------------------------------------------------------------------- OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) { return m_sActionString; } -// --------------------------------------------------------------------------------------------------------------------- void UndoElement::impl_toggleModelState() { // get a snapshot of the current state of our model @@ -102,23 +95,18 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException) { impl_toggleModelState(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException) { impl_toggleModelState(); } -// ===================================================================================================================== // = ShapeUndoElement -// ===================================================================================================================== -// --------------------------------------------------------------------------------------------------------------------- ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ) :ShapeUndoElement_MBase() ,ShapeUndoElement_TBase( m_aMutex ) @@ -126,12 +114,10 @@ ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ) { } -// --------------------------------------------------------------------------------------------------------------------- ShapeUndoElement::~ShapeUndoElement() { } -// --------------------------------------------------------------------------------------------------------------------- OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) { if ( !m_pAction ) @@ -139,7 +125,6 @@ OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) return m_pAction->GetComment(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) @@ -147,7 +132,6 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce m_pAction->Undo(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) @@ -155,7 +139,6 @@ void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeExce m_pAction->Redo(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::disposing() { } diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 7f3687abdfa0..8a11e4dc58de 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -88,7 +88,6 @@ private: ::boost::shared_ptr< ChartModelClone > m_pModelClone; }; - typedef ::cppu::BaseMutex ShapeUndoElement_MBase; typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase; class ShapeUndoElement :public ShapeUndoElement_MBase diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index cf9b537f5478..ffd38e810456 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoCommandDispatch.hxx" #include "ResId.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 01727c88b4a7..3617366e574b 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoGuard.hxx" #include "ChartModelClone.hxx" #include "UndoActions.hxx" @@ -34,8 +33,6 @@ using ::com::sun::star::uno::Sequence; namespace chart { -//----------------------------------------------------------------------------- - UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager > & i_undoManager, const ModelFacet i_facet ) :m_xChartModel( i_undoManager->getParent(), uno::UNO_QUERY_THROW ) @@ -47,16 +44,12 @@ UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< docume m_pDocumentSnapshot.reset( new ChartModelClone( m_xChartModel, i_facet ) ); } -//----------------------------------------------------------------------------- - UndoGuard::~UndoGuard() { if ( !!m_pDocumentSnapshot ) discardSnapshot(); } -//----------------------------------------------------------------------------- - void UndoGuard::commit() { if ( !m_bActionPosted && !!m_pDocumentSnapshot ) @@ -75,8 +68,6 @@ void UndoGuard::commit() m_bActionPosted = true; } -//----------------------------------------------------------------------------- - void UndoGuard::rollback() { ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" ); @@ -84,7 +75,6 @@ void UndoGuard::rollback() discardSnapshot(); } -//----------------------------------------------------------------------------- void UndoGuard::discardSnapshot() { ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" ); @@ -92,8 +82,6 @@ void UndoGuard::discardSnapshot() m_pDocumentSnapshot.reset(); } -//----------------------------------------------------------------------------- - UndoLiveUpdateGuard::UndoLiveUpdateGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL ) { @@ -105,8 +93,6 @@ UndoLiveUpdateGuard::~UndoLiveUpdateGuard() rollback(); } -//----------------------------------------------------------------------------- - UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_DATA ) @@ -119,16 +105,12 @@ UndoLiveUpdateGuardWithData::~UndoLiveUpdateGuardWithData() rollback(); } -//----------------------------------------------------------------------------- - UndoGuardWithSelection::UndoGuardWithSelection( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_SELECTION ) { } -//----------------------------------------------------------------------------- - UndoGuardWithSelection::~UndoGuardWithSelection() { if ( !isActionPosted() ) @@ -151,8 +133,6 @@ HiddenUndoContext::HiddenUndoContext( const Reference< document::XUndoManager > } } -//----------------------------------------------------------------------------- - HiddenUndoContext::~HiddenUndoContext() { try diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index d4566e60bd2e..f2000b02ce40 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -98,6 +98,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcontroller_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_chart2_controller ); } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |