summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-11-06 21:42:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-11-08 14:21:06 +0100
commitb6052b6f78a4486f129dbaef9db3106c4f289cae (patch)
tree7fc0fa6fdb5ced37dbbf6cf90ca7d4daa661c48d
parent640ae4bf97530882614796aed669be8c4fd91fe4 (diff)
tdf#107586, import chart sheet color
Change-Id: Ie7d728cd36c93d5f398266ee65be0e1bf14a0c97 Reviewed-on: https://gerrit.libreoffice.org/62974 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 06e90234e402717e3ef04cf712d34c9165dbc08e) Reviewed-on: https://gerrit.libreoffice.org/62980 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/filter/oox/chartsheetfragment.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index 70541ed4e620..00a90bb8eab0 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -50,7 +50,7 @@ ContextHandlerRef ChartsheetFragment::onCreateContext( sal_Int32 nElement, const
{
case XLS_TOKEN( sheetViews ): return this;
- case XLS_TOKEN( sheetPr ): getWorksheetSettings().importChartSheetPr( rAttribs ); break;
+ case XLS_TOKEN( sheetPr ): getWorksheetSettings().importChartSheetPr( rAttribs ); return this;
case XLS_TOKEN( sheetProtection ): getWorksheetSettings().importChartProtection( rAttribs ); break;
case XLS_TOKEN( pageMargins ): getPageSettings().importPageMargins( rAttribs ); break;
case XLS_TOKEN( pageSetup ): getPageSettings().importChartPageSetup( getRelations(), rAttribs ); break;
@@ -75,6 +75,14 @@ ContextHandlerRef ChartsheetFragment::onCreateContext( sal_Int32 nElement, const
case XLS_TOKEN( evenFooter ): return this; // collect contents in onCharacters()
}
break;
+
+ case XLS_TOKEN( sheetPr ):
+ switch( nElement )
+ {
+ case XLS_TOKEN( tabColor ): getWorksheetSettings().importTabColor( rAttribs ); break;
+ }
+ break;
+
}
return nullptr;
}