[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/inc sc/source

[Tsutomu Uchino]

 sc/inc/ViewSettingsSequenceDefines.hxx |   17 +++++++++--------
 sc/source/ui/view/viewdata.cxx         |    4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit d3fb83cbaea17418def1ace6e868d8892d64d85d
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Tue Jan 27 13:25:47 2015 +0000

    #i85241# store settings about value highlighting in document

diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index bb45344..a77303a 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -27,7 +27,7 @@
 // this are the defines for the position of the settings in the
 // ViewSettingsSequence
 
-#define SC_VIEWSETTINGS_COUNT               23
+#define SC_VIEWSETTINGS_COUNT               24
 
 #define SC_VIEW_ID                          0
 #define SC_TABLE_VIEWSETTINGS               1
@@ -45,13 +45,14 @@
 #define SC_COLROWHDR                        13
 #define SC_SHEETTABS                        14
 #define SC_OUTLSYMB                         15
-#define SC_SNAPTORASTER                     16
-#define SC_RASTERVIS                        17
-#define SC_RASTERRESX                       18
-#define SC_RASTERRESY                       19
-#define SC_RASTERSUBX                       20
-#define SC_RASTERSUBY                       21
-#define SC_RASTERSYNC                       22
+#define SC_VALUE_HIGHLIGHTING               16
+#define SC_SNAPTORASTER                     17
+#define SC_RASTERVIS                        18
+#define SC_RASTERRESX                       19
+#define SC_RASTERRESY                       20
+#define SC_RASTERSUBX                       21
+#define SC_RASTERSUBY                       22
+#define SC_RASTERSYNC                       23
 
 
 // this are the defines for the position of the settings in the
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8c09eee..1ef28b5 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2766,6 +2766,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) );
             pSettings[SC_OUTLSYMB].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB));
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) );
+            pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) );
+            ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_VALUE_HIGHLIGHTING].Value, pOptions->GetOption( VOPT_SYNTAX ) );
 
             const ScGridOptions& aGridOpt = pOptions->GetGridOptions();
             pSettings[SC_SNAPTORASTER].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER));
@@ -2916,6 +2918,8 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
             if ( rSettings[i].Value >>= nTemp16 )
                 pOptions->SetObjMode( VOBJ_TYPE_DRAW, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW );
         }
+        else if ( sName.compareToAscii( SC_UNO_VALUEHIGH ) == 0 )
+            pOptions->SetOption( VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
         else
         {
             ScGridOptions aGridOpt(pOptions->GetGridOptions());