diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-05-10 16:30:45 +0200 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-05-10 16:30:45 +0200 |
| commit | e0a1128c4b13e2f32a76e0b5f55839b705798da0 (patch) | |
| tree | ca6335b03a2d84a244617577612bdb1e15db84ed /chart2/source/view/main | |
| parent | 0581e072a69d06abd1bdcc8b5cc14771b110e6f9 (diff) | |
chartpositioning: #i100778# switch to manual positioning if shapes are added via user interface
Diffstat (limited to 'chart2/source/view/main')
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 534c24cae1ad..886bab7ced29 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -72,15 +72,12 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> #include <svx/unofill.hxx> -#include <unotools/saveopt.hxx> #include <time.h> #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/MissingValueTreatment.hpp> -#include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart2/ExplicitSubIncrement.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -2989,27 +2986,8 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException) //When a view update is requested (what happens for creating the metafile or displaying //the chart in edit mode or printing) it is most likely that all necessary informations are available - like the underlying spreadsheet data for example. //Those data is important for the correct axis lable sizes which are needed during conversion. - const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); - if( nCurrentODFVersion == SvtSaveOptions::ODFVER_LATEST )//#i100778# todo: change this dependent on fileformat evolution - { - uno::Reference< ::com::sun::star::chart::XChartDocument > xOldDoc( m_xChartModel, uno::UNO_QUERY ) ; - if( xOldDoc.is() ) - { - uno::Reference< ::com::sun::star::chart::XDiagramPositioning > xDiagramPositioning( xOldDoc->getDiagram(), uno::UNO_QUERY ); - if( xDiagramPositioning.is() && !xDiagramPositioning->isAutomaticDiagramPositioning() && !xDiagramPositioning->isExcludingDiagramPositioning() ) - { - { - ControllerLockGuard aCtrlLockGuard( m_xChartModel ); - uno::Reference< util::XModifiable > xModifiable( m_xChartModel, uno::UNO_QUERY ); - bool bModelWasModified = xModifiable.is() && xModifiable->isModified(); - xDiagramPositioning->setDiagramPositionExcludingAxes( xDiagramPositioning->calculateDiagramPositionExcludingAxes() ); - if(!bModelWasModified && xModifiable.is() ) - xModifiable->setModified(sal_False); - } - impl_updateView(); - } - } - } + if( DiagramHelper::switchDiagramPositioningToExcludingPositioning( m_xChartModel, true, false ) ) + impl_updateView(); } // ____ XPropertySet ____ |