DEV300: merge 000330 till r. b727f1beb700

4 files changed, 24 insertions, 25 deletions

diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index ffc1e95ca796..1b0d8fb4889c 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -52,17 +52,6 @@ namespace chart
 namespace wrapper
 {
 
-namespace
-{
-
-rtl::OUString lcl_getCIDForDiagram( const Reference< frame::XModel >& xChartModel )
-{
-    uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
-    return ObjectIdentifier::createClassifiedIdentifierForObject( xDiagram, xChartModel );
-}
-
-} //anonymous namespace
-
 Chart2ModelContact::Chart2ModelContact(
     const Reference< uno::XComponentContext > & xContext ) :
         m_xContext( xContext ),
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index edf8ad2b6209..d6487d425657 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -239,14 +239,14 @@ void lcl_AddPropertiesToVector(
         Property( C2U( "DisableComplexChartTypes" ),
                   PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ) );
+                  //#i112666# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ) );
     rOutProperties.push_back(
         Property( C2U( "DisableDataTableDialog" ),
                   PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ) );
+                  //#i112666# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ) );
 }
 
 const uno::Sequence< Property > & lcl_GetPropertySequence()
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index eb3c76dd2c40..c0be0ddcbf0d 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -749,20 +749,19 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
     if( xProp.is() )
     {
-        if( aPosition.X < 0 || aPosition.Y < 0 || aPosition.X > 1 || aPosition.Y > 1 )
-        {
-            DBG_ERROR("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" );
-            uno::Any aEmpty;
-            xProp->setPropertyValue( C2U( "RelativePosition" ), aEmpty );
-            return;
-        }
-
         awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
 
         chart2::RelativePosition aRelativePosition;
         aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
         aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width);
         aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height);
+        if( aRelativePosition.Primary < 0 || aRelativePosition.Secondary < 0 || aRelativePosition.Primary > 1 || aRelativePosition.Secondary > 1 )
+        {
+            DBG_ERROR("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" );
+            uno::Any aEmpty;
+            xProp->setPropertyValue( C2U( "RelativePosition" ), aEmpty );
+            return;
+        }
         xProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) );
         xProp->setPropertyValue( C2U( "PosSizeExcludeAxes" ), uno::makeAny(false) );
     }
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index f104045727bb..f32a882aa1e9 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -41,6 +41,7 @@
 #include "CommonFunctors.hxx"
 #include "ControllerLockGuard.hxx"
 #include "ChartTypeHelper.hxx"
+#include "ThreeDHelper.hxx"
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
@@ -525,6 +526,9 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
 
     try
     {
+        Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() );
+        ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram );
+
         sal_Int32 nSeriesInChartType = 0;
         const sal_Int32 nTotalSeries = countSeries();
         if( xChartType.is())
@@ -540,7 +544,7 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
                 xChartType,
                 nTotalSeries, // new series' index
                 nSeriesInChartType,
-                m_xChartDocument->getFirstDiagram(),
+                xDiagram,
                 m_xTemplate,
                 bCreateDataCachedSequences ));
 
@@ -561,6 +565,8 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
             aSeries.insert( aIt, xNewSeries );
             xSeriesCnt->setDataSeries( ContainerToSequence( aSeries ));
         }
+
+        ThreeDHelper::setScheme( xDiagram, e3DScheme );
     }
     catch( uno::Exception & ex )
     {
@@ -694,14 +700,19 @@ bool DialogModel::setData(
             m_xTemplate->getDataInterpreter());
         if( xInterpreter.is())
         {
+            Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() );
+            ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram );
+
             ::std::vector< Reference< XDataSeries > > aSeriesToReUse(
-                DiagramHelper::getDataSeriesFromDiagram( m_xChartDocument->getFirstDiagram()));
+                DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
             applyInterpretedData(
                 xInterpreter->interpretDataSource(
                     xDataSource, rArguments,
                     ContainerToSequence( aSeriesToReUse )),
                 aSeriesToReUse,
                 true /* bSetStyles */);
+
+            ThreeDHelper::setScheme( xDiagram, e3DScheme );
         }
     }
     catch( uno::Exception & ex )