summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-18 13:36:52 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-18 13:36:52 +0000
commitffbb0826af08ed1e4229c45e9a8d234c44280841 (patch)
treed4c52df0c8e9ba6d8ded70c64e7b1045032be143 /oox/source
parent1d079573981b5abec4f3ecfde5e46cd5a89904ca (diff)
INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED
2008/03/03 16:38:12 dr 1.2.12.3: create the chart objects 2008/02/27 11:14:58 dr 1.2.12.2: first steps: chart API conversion 2008/02/21 12:42:07 hbrinkm 1.2.12.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/xls/excelfilter.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx
index c742bc6a5bd2..47471138fb07 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/oox/source/xls/excelfilter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: excelfilter.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -32,6 +32,7 @@
#include "oox/helper/binaryinputstream.hxx"
#include "oox/xls/biffdetector.hxx"
#include "oox/xls/biffinputstream.hxx"
+#include "oox/xls/excelchartconverter.hxx"
#include "oox/xls/themebuffer.hxx"
#include "oox/xls/workbookfragment.hxx"
#include "oox/dump/biffdumper.hxx"
@@ -116,7 +117,7 @@ bool ExcelFilter::exportDocument() throw()
sal_Int32 ExcelFilter::getSchemeClr( sal_Int32 nColorSchemeToken ) const
{
OSL_ENSURE( mpHelper, "ExcelFilter::getSchemeClr - no workbook helper" );
- return mpHelper ? mpHelper->getTheme().getColorByToken( nColorSchemeToken ) : -1;
+ return mpHelper->getTheme().getColorByToken( nColorSchemeToken );
}
const DrawingPtr ExcelFilter::getDrawings()
@@ -124,6 +125,12 @@ const DrawingPtr ExcelFilter::getDrawings()
return DrawingPtr();
}
+::oox::drawingml::chart::ChartConverter& ExcelFilter::getChartConverter()
+{
+ OSL_ENSURE( mpHelper, "ExcelFilter::getChartConverter - no workbook helper" );
+ return mpHelper->getChartConverter();
+}
+
OUString ExcelFilter::implGetImplementationName() const
{
return ExcelFilter_getImplementationName();