commit 7daf15884d980a8b848f3bdf9bdaed498dcb7b55
author Tsutomu Uchino <hanya@apache.org> Tue Jan 27 13:25:47 2015 +0000
committer Caolán McNamara <caolanm@redhat.com> Tue Jan 27 16:50:55 2015 +0000
tree bcded96fb8b777533898f54aa352c4afdedb3ac4
parent 61cc3f285a3d32b754435d1a1b513abeca8fb4e7

Resolves: #i85241# store settings about value highlighting in document

(cherry picked from commit d3fb83cbaea17418def1ace6e868d8892d64d85d)

Change-Id: I34b4ee12e4af8300a51d72f0dd36e27c79832eb5

sc/inc/ViewSettingsSequenceDefines.hxx

diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index 5bbaff44a..d80346c 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -23,7 +23,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
@@ -41,13 +41,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
// TableViewSettingsSequence

sc/source/ui/view/viewdata.cxx

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 357b900..5ac8886 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2708,6 +2708,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
            ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) );
            pSettings[SC_OUTLSYMB].Name = 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 = SC_UNO_SNAPTORASTER;
@@ -2861,6 +2863,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());