[Libreoffice-commits] .: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/tool/viewopti.cxx  |    2 +-
 sc/source/filter/xml/xmlexprt.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aebb10b71159acc39551407ca39a96329e2f774e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 8 02:04:45 2011 +0200

    show row/column headers as default again

diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 0cf249c..4108ffb 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -345,7 +345,6 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
     static const char* aPropNames[] =
     {
         "Line/GridLine",            // SCLAYOUTOPT_GRIDLINES
-        "Line/GridOnColoredCells",  // SCLAYOUTOPT_GRID_ONCOLOR
         "Line/GridLineColor",       // SCLAYOUTOPT_GRIDCOLOR
         "Line/PageBreak",           // SCLAYOUTOPT_PAGEBREAK
         "Line/Guide",               // SCLAYOUTOPT_GUIDE
@@ -356,6 +355,7 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
         "Window/VerticalScroll",    // SCLAYOUTOPT_VERTSCROLL
         "Window/SheetTab",          // SCLAYOUTOPT_SHEETTAB
         "Window/OutlineSymbol"      // SCLAYOUTOPT_OUTLINE
+        "Line/GridOnColoredCells",  // SCLAYOUTOPT_GRID_ONCOLOR
     };
     Sequence<OUString> aNames(SCLAYOUTOPT_COUNT);
     OUString* pNames = aNames.getArray();
commit 830650fa2480c1b399fd7c370e4b1362662f6f64
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Aug 7 18:42:35 2011 +0200

    don't use ODFVER_LATEST instead of ODFVER_012

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 6541418..5ef06cf 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2740,7 +2740,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe
     CheckAttrList();
 
     if ( pDoc && pDoc->GetSheetEvents( static_cast<SCTAB>(nTable) ) &&
-         getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
+         getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
     {
         // store sheet events
         uno::Reference<document::XEventsSupplier> xSupplier(xTable, uno::UNO_QUERY);
@@ -4305,7 +4305,7 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
 
             // sheet events use officeooo namespace
             if( (getExportFlags() & EXPORT_CONTENT) != 0 &&
-                getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
+                getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
             {
                 bool bAnySheetEvents = false;
                 SCTAB nTabCount = pDoc->GetTableCount();