oox/Library_oox.mk | 1
oox/inc/drawingml/chart/datatableconverter.hxx | 45 +++++++++++++++++++
oox/inc/drawingml/chart/plotareaconverter.hxx | 15 ------
oox/source/drawingml/chart/datatablecontext.cxx | 2
oox/source/drawingml/chart/datatableconverter.cxx | 50 ++++++++++++++++++++++
oox/source/drawingml/chart/plotareaconverter.cxx | 22 ---------
6 files changed, 99 insertions(+), 36 deletions(-)
New commits:
commit 2e9e057913d5f31490f62ad60d2bae39ae81afee
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Apr 15 15:53:56 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Apr 18 15:55:12 2022 +0200
oox: move DataTableConverter into own file
Change-Id: I3dce87ecd5b8f69862f26edb66fe54c6acee8660
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133117
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 01da0aa4374d..88da558a3f89 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/chart/datasourceconverter \
oox/source/drawingml/chart/datasourcemodel \
oox/source/drawingml/chart/datatablecontext \
+ oox/source/drawingml/chart/datatableconverter \
oox/source/drawingml/chart/modelbase \
oox/source/drawingml/chart/objectformatter \
oox/source/drawingml/chart/plotareacontext \
diff --git a/oox/inc/drawingml/chart/datatableconverter.hxx
b/oox/inc/drawingml/chart/datatableconverter.hxx
new file mode 100644
index 000000000000..f49d908f4aa5
--- /dev/null
+++ b/oox/inc/drawingml/chart/datatableconverter.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <drawingml/chart/converterbase.hxx>
+
+namespace com::sun::star::chart2
+{
+class XDiagram;
+}
+
+namespace oox::drawingml::chart
+{
+struct DataTableModel;
+
+class DataTableConverter final : public ConverterBase<DataTableModel>
+{
+public:
+ explicit DataTableConverter(const ConverterRoot& rParent, DataTableModel&
rModel);
+ virtual ~DataTableConverter() override;
+
+ /** Converts the OOXML data table model to a chart2 diagram. */
+ void convertFromModel(css::uno::Reference<css::chart2::XDiagram> const&
rxDiagram);
+};
+
+} // namespace oox::drawingml::chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx
b/oox/inc/drawingml/chart/plotareaconverter.hxx
index 0b389c0fdc78..b520c6b4816c 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -59,21 +59,6 @@ public:
ObjectType eObjType );
};
-
-struct DataTableModel;
-
-class DataTableConverter final : public ConverterBase< DataTableModel >
-{
-public:
- explicit DataTableConverter( const ConverterRoot& rParent,
DataTableModel& rModel );
- virtual ~DataTableConverter() override;
-
- /** Converts the OOXML data table model to a chart2 diagram. */
- void convertFromModel(
- const css::uno::Reference< css::chart2::XDiagram
>& rxDiagram);
-};
-
-
struct PlotAreaModel;
class PlotAreaConverter final : public ConverterBase< PlotAreaModel >
diff --git a/oox/source/drawingml/chart/datatablecontext.cxx
b/oox/source/drawingml/chart/datatablecontext.cxx
index c40a4f782450..0813a6424312 100644
--- a/oox/source/drawingml/chart/datatablecontext.cxx
+++ b/oox/source/drawingml/chart/datatablecontext.cxx
@@ -55,7 +55,7 @@ ContextHandlerRef DataTableContext::onCreateContext(sal_Int32
nElement,
mrModel.mbShowOutline = rAttribs.getBool(XML_val, false);
break;
case C_TOKEN(showKeys):
- //mrModel.mbShowKeys = rAttribs.getBool( XML_val, false );
+ mrModel.mbShowKeys = rAttribs.getBool(XML_val, false);
break;
}
break;
diff --git a/oox/source/drawingml/chart/datatableconverter.cxx
b/oox/source/drawingml/chart/datatableconverter.cxx
new file mode 100644
index 000000000000..802edc9464ac
--- /dev/null
+++ b/oox/source/drawingml/chart/datatableconverter.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <drawingml/chart/datatableconverter.hxx>
+
+#include <com/sun/star/chart2/XDiagram.hpp>
+#include <drawingml/chart/plotareamodel.hxx>
+#include <oox/token/properties.hxx>
+
+using namespace css;
+
+namespace oox::drawingml::chart
+{
+DataTableConverter::DataTableConverter(const ConverterRoot& rParent,
DataTableModel& rModel)
+ : ConverterBase<DataTableModel>(rParent, rModel)
+{
+}
+
+DataTableConverter::~DataTableConverter() = default;
+
+void DataTableConverter::convertFromModel(uno::Reference<chart2::XDiagram>
const& rxDiagram)
+{
+ PropertySet aPropSet(rxDiagram);
+ if (mrModel.mbShowHBorder)
+ aPropSet.setProperty(PROP_DataTableHBorder, mrModel.mbShowHBorder);
+ if (mrModel.mbShowVBorder)
+ aPropSet.setProperty(PROP_DataTableVBorder, mrModel.mbShowVBorder);
+ if (mrModel.mbShowOutline)
+ aPropSet.setProperty(PROP_DataTableOutline, mrModel.mbShowOutline);
+}
+
+} // namespace oox
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx
b/oox/source/drawingml/chart/plotareaconverter.cxx
index 9a0f9d337c8a..afbb28adee03 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <osl/diagnose.h>
+#include <drawingml/chart/datatableconverter.hxx>
#include <drawingml/chart/axisconverter.hxx>
#include <drawingml/chart/plotareamodel.hxx>
#include <drawingml/chart/typegroupconverter.hxx>
@@ -292,26 +293,6 @@ void WallFloorConverter::convertFromModel( const
Reference< XDiagram >& rxDiagra
}
}
-DataTableConverter::DataTableConverter( const ConverterRoot& rParent,
DataTableModel& rModel ) :
- ConverterBase< DataTableModel >( rParent, rModel )
-{
-}
-
-DataTableConverter::~DataTableConverter()
-{
-}
-
-void DataTableConverter::convertFromModel( const Reference< XDiagram >&
rxDiagram )
-{
- PropertySet aPropSet( rxDiagram );
- if (mrModel.mbShowHBorder)
- aPropSet.setProperty( PROP_DataTableHBorder, mrModel.mbShowHBorder );
- if (mrModel.mbShowVBorder)
- aPropSet.setProperty( PROP_DataTableVBorder, mrModel.mbShowVBorder);
- if (mrModel.mbShowOutline)
- aPropSet.setProperty( PROP_DataTableOutline, mrModel.mbShowOutline );
-}
-
PlotAreaConverter::PlotAreaConverter( const ConverterRoot& rParent,
PlotAreaModel& rModel ) :
ConverterBase< PlotAreaModel >( rParent, rModel ),
mb3dChart( false ),
@@ -454,6 +435,7 @@ void PlotAreaConverter::convertFromModel( View3DModel&
rView3DModel )
DataTableConverter dataTableConverter (*this,
mrModel.mxDataTable.getOrCreate());
dataTableConverter.convertFromModel(xDiagram);
+
// plot area formatting
if( xDiagram.is() && !mb3dChart )
{
