[Libreoffice-commits] core.git: sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 6 21:45:20 UTC 2018


 sc/source/filter/oox/chartsheetfragment.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 06e90234e402717e3ef04cf712d34c9165dbc08e
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Tue Nov 6 21:42:43 2018 +0100
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Tue Nov 6 22:43:52 2018 +0100

    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 at googlemail.com>

diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index 313024eefe6a..cca6a3ac39d6 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -51,7 +51,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;
@@ -76,6 +76,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;
 }


More information about the Libreoffice-commits mailing list