chartpositioning: #i98398# treat diagram size without title sizes (correct ODF import/export, correct diagram sizing per mouse, correct API for import)

4 files changed, 43 insertions, 5 deletions

diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 7b7802a8f295..3621789099b6 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -693,10 +693,21 @@ void SchXMLPlotAreaContext::EndElement()
     uno::Reference< chart::XDiagramPositioning > xDiaPos( mxDiagram, uno::UNO_QUERY );
     if( xDiaPos.is())
     {
+        bool bOuterSize = m_aOuterPositioning.hasPosSize() && !m_aOuterPositioning.isAutomatic();
         if( m_aInnerPositioning.hasPosSize() )
-            xDiaPos->setDiagramPositionExcludingAxes( m_aInnerPositioning.getRectangle() );
-        else if( m_aOuterPositioning.hasPosSize() )
-            xDiaPos->setDiagramPositionIncludingAxesAndAxesTitles( m_aOuterPositioning.getRectangle() );
+        {
+            if( !m_aInnerPositioning.isAutomatic() )
+                xDiaPos->setDiagramPositionExcludingAxes( m_aInnerPositioning.getRectangle() );
+            else if( bOuterSize )
+                xDiaPos->setDiagramPositionIncludingAxes( m_aOuterPositioning.getRectangle() );
+        }
+        else if( bOuterSize )
+        {
+            if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_4( GetImport().GetModel() ) ) //old version of OOo did write a wrong rectangle for the diagram size
+                xDiaPos->setDiagramPositionIncludingAxesAndAxesTitles( m_aOuterPositioning.getRectangle() );
+            else
+                xDiaPos->setDiagramPositionIncludingAxes( m_aOuterPositioning.getRectangle() );
+        }
     }
 
     CorrectAxisPositions();
@@ -1675,16 +1686,20 @@ SchXMLPositonAttributesHelper::~SchXMLPositonAttributesHelper()
 
 bool SchXMLPositonAttributesHelper::hasSize() const
 {
-    return m_bHasSizeWidth && m_bHasSizeHeight && !m_bAutoSize;
+    return m_bHasSizeWidth && m_bHasSizeHeight;
 }
 bool SchXMLPositonAttributesHelper::hasPosition() const
 {
-    return m_bHasPositionX && m_bHasPositionY && !m_bAutoPosition;
+    return m_bHasPositionX && m_bHasPositionY;
 }
 bool SchXMLPositonAttributesHelper::hasPosSize() const
 {
     return hasPosition() && hasSize();
 }
+bool SchXMLPositonAttributesHelper::isAutomatic() const
+{
+    return m_bAutoSize || m_bAutoPosition;
+}
 awt::Point SchXMLPositonAttributesHelper::getPosition() const
 {
     return m_aPosition;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 632abe209188..cb986d7e7a3d 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -78,6 +78,7 @@ public:
     void readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt );
 
     bool hasPosSize() const;
+    bool isAutomatic() const;
     ::com::sun::star::awt::Rectangle getRectangle() const;
 
 
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index f5059f979b63..f836f1c1de7c 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -705,6 +705,27 @@ void setBuildIDAtImportInfo( uno::Reference< frame::XModel > xModel, Reference<
         SvXMLMetaDocumentContext::setBuildId( aGenerator, xImportInfo );
 }
 
+bool isDocumentGeneratedWithOpenOfficeOlderThan3_4( const uno::Reference< frame::XModel >& xChartModel )
+{
+    bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan3_0( xChartModel );
+    if( !bResult )
+    {
+        ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) );
+        if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/3") ) ) != -1 )
+        {
+            if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/300m") ) ) != -1 )
+                bResult= true;
+            else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/310m") ) ) != -1 )
+                bResult= true;
+            else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/320m") ) ) != -1 )
+                bResult= true;
+            else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/330m") ) ) != -1 )
+                bResult= true;
+        }
+    }
+    return bResult;
+}
+
 bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame::XModel >& xChartModel )
 {
     bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan2_3( xChartModel );
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 35ac3ff72f1b..4912eb5d286e 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -54,6 +54,7 @@ namespace SchXMLTools
     bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
     bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
     bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
+    bool isDocumentGeneratedWithOpenOfficeOlderThan3_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
 
     void setBuildIDAtImportInfo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel
         , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xImportInfo );