[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/inc oox/source sc/source
Muthu Subramanian
sumuthu at suse.com
Thu Jul 18 01:24:34 PDT 2013
oox/inc/oox/core/xmlfilterbase.hxx | 3 +++
oox/source/drawingml/shape.cxx | 15 +++++++++++++++
sc/source/filter/inc/excelfilter.hxx | 1 +
sc/source/filter/inc/workbookhelper.hxx | 4 +++-
sc/source/filter/oox/excelfilter.cxx | 5 +++++
sc/source/filter/oox/workbookhelper.cxx | 21 ++++++++++++++++++---
6 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit 675a50a26390fc7c98c107ec6728ccfdc32ec5c0
Author: Muthu Subramanian <sumuthu at suse.com>
Date: Thu Jul 18 14:04:32 2013 +0530
n#819822: XLSX Chart import with internal data table.
When the import with xlsx ranges fail - try with
internal data table.
Ported from: 7da06efd74be6500895bab6e5e8ed485914ff45e
and: da4ec594da45210a1f97d31ecb3e7f9c127954e5
diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx
index bf066fd..f75c69d 100644
--- a/oox/inc/oox/core/xmlfilterbase.hxx
+++ b/oox/inc/oox/core/xmlfilterbase.hxx
@@ -90,6 +90,9 @@ public:
converter object, that should be global per imported document. */
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() = 0;
+ /** Helper to switch chart data table - specifically for xlsx imports */
+ virtual void useInternalChartDataTable( bool /*bInternal*/ ) { }
+
/** Has to be implemented by each filter to return the table style list. */
virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8a4cdca..6c30d12 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -52,6 +52,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <com/sun/star/document/XActionLockable.hpp>
+#include <com/sun/star/chart2/data/XDataReceiver.hpp>
using rtl::OUString;
using namespace ::oox::core;
@@ -695,7 +696,21 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
if( !mxChartShapeInfo->mbEmbedShapes )
xExternalPage = rxShapes;
if( rFilter.getChartConverter() )
+ {
rFilter.getChartConverter()->convertFromModel( rFilter, aModel, xChartDoc, xExternalPage, mxShape->getPosition(), mxShape->getSize() );
+ if( !xChartDoc->hasInternalDataProvider() )
+ {
+ Reference< chart2::data::XDataReceiver > xDataRec( xChartDoc, UNO_QUERY );
+ Reference< chart2::data::XDataSource > xData( xDataRec->getUsedData(), UNO_QUERY );
+ if( xData->getDataSequences().getLength() <= 0 || xData->getDataSequences()[0]->getValues()->getData().getLength() <= 0 )
+ {
+ rFilter.useInternalChartDataTable( true );
+ rFilter.getChartConverter()->convertFromModel( rFilter, aModel, xChartDoc, xExternalPage, mxShape->getPosition(), mxShape->getSize() );
+ rFilter.useInternalChartDataTable( false );
+ }
+ }
+
+ }
}
catch( Exception& )
{
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index 5e826bd..057c036 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -61,6 +61,7 @@ public:
virtual ::oox::vml::Drawing* getVmlDrawing();
virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles();
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
+ virtual void useInternalChartDataTable( bool bInternal );
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index a4265dc..f183593 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -23,6 +23,7 @@
#include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx>
#include "oox/helper/storagebase.hxx"
+#include "oox/drawingml/chart/chartconverter.hxx"
#include "biffhelper.hxx"
#include "rangenam.hxx"
@@ -143,6 +144,7 @@ public:
void setCurrentSheetIndex( sal_Int16 nSheet );
/** Final conversion after importing the workbook. */
void finalizeWorkbookImport();
+ void useInternalChartDataTable( bool bInternal );
// document model ---------------------------------------------------------
ScDocument& getScDocument() const;
@@ -246,7 +248,7 @@ public:
/** Returns the converter for string to cell address/range conversion. */
AddressConverter& getAddressConverter() const;
/** Returns the chart object converter. */
- ExcelChartConverter* getChartConverter() const;
+ oox::drawingml::chart::ChartConverter* getChartConverter() const;
/** Returns the page and print settings converter. */
PageSettingsConverter& getPageSettingsConverter() const;
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index dfddf86..c3415f0 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -158,6 +158,11 @@ const TableStyleListPtr ExcelFilter::getTableStyles()
return WorkbookHelper( getWorkbookGlobals() ).getChartConverter();
}
+void ExcelFilter::useInternalChartDataTable( bool bInternal )
+{
+ return WorkbookHelper( getWorkbookGlobals() ).useInternalChartDataTable( bInternal );
+}
+
GraphicHelper* ExcelFilter::implCreateGraphicHelper() const
{
return new ExcelGraphicHelper( getWorkbookGlobals() );
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index c3c2fbb..252ee0c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -170,6 +170,8 @@ public:
Reference< XDatabaseRange > createUnnamedDatabaseRangeObject( const CellRangeAddress& rRangeAddr ) const;
/** Creates and returns a com.sun.star.style.Style object for cells or pages. */
Reference< XStyle > createStyleObject( OUString& orStyleName, bool bPageStyle ) const;
+ /** Helper to switch chart data table - specifically for xlsx imports */
+ void useInternalChartDataTable( bool bInternal );
// buffers ----------------------------------------------------------------
@@ -210,7 +212,7 @@ public:
/** Returns the converter for string to cell address/range conversion. */
inline AddressConverter& getAddressConverter() const { return *mxAddrConverter; }
/** Returns the chart object converter. */
- inline ExcelChartConverter* getChartConverter() const { return mxChartConverter.get(); }
+ inline oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); }
/** Returns the page/print settings converter. */
inline PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; }
@@ -253,7 +255,7 @@ private:
typedef ::std::auto_ptr< FormulaParser > FormulaParserPtr;
typedef ::std::auto_ptr< UnitConverter > UnitConvPtr;
typedef ::std::auto_ptr< AddressConverter > AddressConvPtr;
- typedef ::std::auto_ptr< ExcelChartConverter > ExcelChartConvPtr;
+ typedef ::std::auto_ptr< oox::drawingml::chart::ChartConverter > ExcelChartConvPtr;
typedef ::std::auto_ptr< PageSettingsConverter > PageSettConvPtr;
typedef ::std::auto_ptr< BiffCodecHelper > BiffCodecHelperPtr;
@@ -496,6 +498,14 @@ Reference< XStyle > WorkbookGlobals::createStyleObject( OUString& orStyleName, b
return xStyle;
}
+void WorkbookGlobals::useInternalChartDataTable( bool bInternal )
+{
+ if( bInternal )
+ mxChartConverter.reset( new oox::drawingml::chart::ChartConverter() );
+ else
+ mxChartConverter.reset( new ExcelChartConverter( *this ) );
+}
+
// BIFF specific --------------------------------------------------------------
// private --------------------------------------------------------------------
@@ -872,11 +882,16 @@ AddressConverter& WorkbookHelper::getAddressConverter() const
return mrBookGlob.getAddressConverter();
}
-ExcelChartConverter* WorkbookHelper::getChartConverter() const
+oox::drawingml::chart::ChartConverter* WorkbookHelper::getChartConverter() const
{
return mrBookGlob.getChartConverter();
}
+void WorkbookHelper::useInternalChartDataTable( bool bInternal )
+{
+ mrBookGlob.useInternalChartDataTable( bInternal );
+}
+
PageSettingsConverter& WorkbookHelper::getPageSettingsConverter() const
{
return mrBookGlob.getPageSettingsConverter();
More information about the Libreoffice-commits
mailing list