core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2024-05-07 Thread Heiko Tietze (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   10 ++
 sc/inc/ViewSettingsSequenceDefines.hxx   |   35 +-
 sc/inc/unonames.hxx  |1 
 sc/inc/viewopti.hxx  |1 
 sc/source/core/data/postit.cxx   |4 -
 sc/source/core/tool/viewopti.cxx |   21 --
 sc/source/ui/inc/tpview.hxx  |2 
 sc/source/ui/optdlg/tpview.cxx   |   11 +++
 sc/source/ui/unoobj/confuno.cxx  |5 +
 sc/source/ui/unoobj/viewuno.cxx  |4 +
 sc/source/ui/view/viewdata.cxx   |4 +
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   52 +++
 12 files changed, 112 insertions(+), 38 deletions(-)

New commits:
commit a5d0114bbb40f5bffcb19d6e6b3a5bf43aab1446
Author: Heiko Tietze 
AuthorDate: Tue May 7 08:56:07 2024 +0200
Commit: Heiko Tietze 
CommitDate: Tue May 7 15:48:04 2024 +0200

Resolves tdf#156885 - Make comment authorship optional

Change-Id: I3422c9e5606fa9eb9aa450f518af8426e598ab8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167260
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index fb6edf076f17..7303d1bacd00 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -106,13 +106,21 @@
   true
 
 
-  
+  
   
 If less than 1, the size of comment indicator is calculated 
dynamically; otherwise this value will be used.
 Comment indicator size
   
   0
 
+
+  
+  
+Indicates whether authorship metadata for comments on hover 
are shown.
+Comment authorship
+  
+  true
+
 
   
   
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx 
b/sc/inc/ViewSettingsSequenceDefines.hxx
index 0c04aa594e68..1cb2b59eb9fc 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -24,7 +24,7 @@
 // this are the defines for the position of the settings in the
 // ViewSettingsSequence
 
-#define SC_VIEWSETTINGS_COUNT   26
+#define SC_VIEWSETTINGS_COUNT   27
 
 #define SC_VIEW_ID  0
 #define SC_TABLE_VIEWSETTINGS   1
@@ -36,22 +36,23 @@
 #define SC_PAGE_BREAK_PREVIEW   7
 #define SC_SHOWZERO 8
 #define SC_SHOWNOTES9
-#define SC_SHOWFORMULASMARKS10
-#define SC_SHOWGRID 11
-#define SC_GRIDCOLOR12
-#define SC_SHOWPAGEBR   13
-#define SC_COLROWHDR14
-#define SC_SHEETTABS15
-#define SC_OUTLSYMB 16
-#define SC_VALUE_HIGHLIGHTING   17
-#define SC_SNAPTORASTER 18
-#define SC_RASTERVIS19
-#define SC_RASTERRESX   20
-#define SC_RASTERRESY   21
-#define SC_RASTERSUBX   22
-#define SC_RASTERSUBY   23
-#define SC_RASTERSYNC   24
-#define SC_FORMULA_BAR_HEIGHT   25
+#define SC_SHOWNOTEAUTHOR   10
+#define SC_SHOWFORMULASMARKS11
+#define SC_SHOWGRID 12
+#define SC_GRIDCOLOR13
+#define SC_SHOWPAGEBR   14
+#define SC_COLROWHDR15
+#define SC_SHEETTABS16
+#define SC_OUTLSYMB 17
+#define SC_VALUE_HIGHLIGHTING   18
+#define SC_SNAPTORASTER 19
+#define SC_RASTERVIS20
+#define SC_RASTERRESX   21
+#define SC_RASTERRESY   22
+#define SC_RASTERSUBX   23
+#define SC_RASTERSUBY   24
+#define SC_RASTERSYNC   25
+#define SC_FORMULA_BAR_HEIGHT   26
 
 // this are the defines for the position of the settings in the
 // TableViewSettingsSequence
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 07c9c39ace30..13bb2600f471 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -561,6 +561,7 @@ inline constexpr OUString SC_UNO_SHOWFORM = 
u"ShowFormulas"_ustr;
 inline constexpr OUString SC_UNO_SHOWGRID = u"ShowGrid"_ustr;
 inline constexpr OUString SC_UNO_SHOWHELP = u"ShowHelpLines"_ustr;
 inline constexpr OUString SC_UNO_SHOWNOTES=

core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2024-02-19 Thread Balazs Varga (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   24 
 sc/inc/formulaopt.hxx|4 
 sc/inc/globstr.hrc   |1 
 sc/source/core/tool/formulaopt.cxx   |   62 ++--
 sc/source/filter/xml/xmlimprt.cxx|   77 ++-
 sc/source/filter/xml/xmlimprt.hxx|1 
 sc/source/ui/inc/tpformula.hxx   |1 
 sc/source/ui/optdlg/tpformula.cxx|   12 ++
 sc/uiconfig/scalc/ui/optformula.ui   |   37 +++
 9 files changed, 211 insertions(+), 8 deletions(-)

New commits:
commit 2d2974f22ab59ea7dab1aee778308c4f50ff5464
Author: Balazs Varga 
AuthorDate: Wed Feb 14 22:34:10 2024 +0100
Commit: Balazs Varga 
CommitDate: Mon Feb 19 23:24:54 2024 +0100

tdf#124098 sc add global config setting "RecalcOptimalRowHeightMode"

to optimal row height recalculation for optimal document loading.

If the "RecalcOptimalRowHeightMode" is set to "Recalc always" we always
recalculate the optimal row heights at load time, without any warning 
dialog.
If the "RecalcOptimalRowHeightMode" is set to "Recalc" we never recalculate
the optimal row heights at load time, without any warning dialog.
If the "RecalcOptimalRowHeightMode" is set to "Ask before Recalc" we ask 
the user
if want to recalculate the optimal row heights at load time or not.

The default value is the same what we are doing now: "Recalc always"

This option was necessary, since optimal row height calculation depending 
on also
the result of the conditional formatted formulas and it takes a lot of time 
to calculate
the optimal row heights and load the document. Because we allow a lot of 
text/cell format
attribute which are effect on the cell size, therefor it is necessary to 
evaluate all
the formulas. Also if we have 20 condition for a cell range we need to 
evaluate all
the 20 formulas for all the cells and it is very expensive at load time.

Change-Id: I9288d11dd2f061f85fa36292a909402a6bb89ea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163421
Tested-by: Jenkins
Reviewed-by: Balazs Varga 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index de97c822c7c1..5582b346910d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1540,6 +1540,30 @@
   
   1
 
+
+  
+  
+Specifies whether to force a hard recalc after load on 
optimal row heights.
+  
+  
+
+  
+Recalc always
+  
+
+
+  
+Recalc never
+  
+
+
+  
+Ask before Recalc
+  
+
+  
+  0
+
   
 
 
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index de46b52643c8..6cc1dedcbbb4 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -30,6 +30,7 @@ private:
 
 ScRecalcOptions meOOXMLRecalc;
 ScRecalcOptions meODFRecalc;
+ScRecalcOptions meReCalcOptiRowHeights;
 
 public:
 ScFormulaOptions();
@@ -64,6 +65,9 @@ public:
 void SetODFRecalcOptions( ScRecalcOptions eOpt ) { meODFRecalc = eOpt; }
 ScRecalcOptions GetODFRecalcOptions() const { return meODFRecalc; }
 
+void SetReCalcOptiRowHeights( ScRecalcOptions eOpt ) { 
meReCalcOptiRowHeights = eOpt; }
+ScRecalcOptions GetReCalcOptiRowHeights() const { return 
meReCalcOptiRowHeights; }
+
 void ResetFormulaSeparators();
 
 static void GetDefaultFormulaSeparators(OUString& rSepArg, OUString& 
rSepArrayCol, OUString& rSepArrayRow);
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index b5badb52dff3..04bfae4f6f82 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -504,6 +504,7 @@
 #define STR_EDIT_EXISTING_COND_FORMATS  
NC_("STR_EDIT_EXISTING_COND_FORMATS", "The selected cell already contains 
conditional formatting. You can either edit the existing conditional format or 
you define a new overlapping conditional format.

 Do you want to edit the existing conditional format?")
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_ODS", "This document was last saved by an 
application other than %PRODUCTNAME.  Some formula cells may produce different 
results when recalculated.

Do you want to recalculate all formula cells in this document now?")
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_XLS", "This document was saved in Excel 
file format (.xlsx). Some formula cells may produce different results when 
recalculated. 

Do you

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig uitest/libreoffice

2023-05-26 Thread Laurent Balland (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   14 +
 sc/inc/stringutil.hxx|   11 ++-
 sc/source/core/data/column3.cxx  |2 
 sc/source/core/tool/stringutil.cxx   |7 +-
 sc/source/ui/dbgui/asciiopt.cxx  |   14 -
 sc/source/ui/dbgui/scuiasciiopt.cxx  |   42 ---
 sc/source/ui/docshell/impex.cxx  |8 +-
 sc/source/ui/inc/asciiopt.hxx|3 +
 sc/source/ui/inc/scuiasciiopt.hxx|1 
 sc/uiconfig/scalc/ui/textimportcsv.ui|   21 +++
 uitest/libreoffice/calc/csv_dialog.py|   15 +
 11 files changed, 120 insertions(+), 18 deletions(-)

New commits:
commit 2b3b4026a5c6a1b92c0b29b94dd62a4c3c7b9fad
Author: Laurent Balland 
AuthorDate: Sat May 20 16:47:16 2023 +0200
Commit: Eike Rathke 
CommitDate: Fri May 26 23:57:16 2023 +0200

tdf#154131 Add Detect scientific number option

Add a sub case of Detect special numbers for import CSV (SC_IMPORTFILE),
paste unformated text (SC_PASTETEXT) and text to columns
(SC_TEXTTOCOLUMNS). Following cases are treated:
- If "Detect special numbers" is true, then "Detect scientific numbers"
  must be true and all special formats are treated (date, time,
scientific notation) in addition to basic decimal numbers.
- If "Detect special numbers" is false and "Detect scientific numbers" is
  true only scientific notation is treated in addition to basic decimal
numbers.
- If "Detect special numbers" and "Detect scientific numbers" are both
  false only basic decimal numbers are recognized as numbers. It is the
new case treated by this change
The new option bDetectScientificNumber is append to ASCII options

Change-Id: I73dff9f75d2c7b07ce155daa29dcc4ca9f288664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152072
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 7a18fb3381d2..d282ca681fa0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1032,6 +1032,13 @@
   
   false
 
+
+  
+If true, Calc tries to detect numbers in scientific 
notation.
+DetectScientificNumbers
+  
+  true
+
 
   
 Language to use for CSV import.  This determines how the 
numbers are parsed.
@@ -1121,6 +1128,13 @@
   
   true
 
+
+  
+If true, Calc tries to detect numbers in scientific 
notation.
+DetectScientificNumbers
+  
+  true
+
 
   
 If true, Calc preserves previous content of cells when 
pasting empty ones. If false, Calc delete content of previous cells.
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index b2b58f60fc5a..3d930dd359df 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -70,11 +70,14 @@ struct SAL_WARN_UNUSED SC_DLLPUBLIC ScSetStringParam
 SvNumberFormatter* mpNumFormatter;
 
 /**
- * When true, we try to detect special number format (dates etc) from the
- * input string, when false, we only try to detect a basic decimal number
- * format.
+ * Specify which number formats are detected:
+ * mbDetectNumberFormat=true && mbDetectScientificNumberFormat=true : 
detect all special number formats : basic decimal number, date, scientific 
notation, etc
+ * mbDetectNumberFormat=false && mbDetectScientificNumberFormat=true : 
detect scientific notation and basic decimal number, but not other special 
number formats (date etc)
+ * mbDetectNumberFormat=false && mbDetectScientificNumberFormat=false : 
detect only basic decimal number, but not scientific notation or other special 
number formats (date etc)
+ * Note: mbDetectNumberFormat=true && mbDetectScientificNumberFormat=false 
not allowed
  */
 bool mbDetectNumberFormat;
+bool mbDetectScientificNumberFormat;
 
 /**
  * Determine when to set the 'Text' number format to the cell where the
@@ -145,7 +148,7 @@ public:
  * @return true if the string is a valid number, false otherwise.
  */
 static bool parseSimpleNumber(
-const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, sal_Unicode 
dsepa, double& rVal);
+const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, sal_Unicode 
dsepa, double& rVal, bool bDetectScientificNumber = true);
 
 static bool parseSimpleNumber(
 const char* p, size_t n, char dsep, char gsep, double& rVal);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2020-11-18 Thread Martin van Zijl (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 
 sc/inc/inputopt.hxx  |3 +
 sc/inc/sc.hrc|2 +
 sc/source/core/tool/inputopt.cxx |   10 -
 sc/source/ui/app/scmod.cxx   |   10 +
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   11 +
 sc/source/ui/view/gridwin.cxx|6 ++-
 sc/uiconfig/scalc/ui/scgeneralpage.ui|   30 +++
 9 files changed, 72 insertions(+), 9 deletions(-)

New commits:
commit a6e1647612cc3d39e8a6e44c9365ccecb1da2fe6
Author: Martin van Zijl 
AuthorDate: Sat Jun 6 15:57:54 2020 +1200
Commit: Eike Rathke 
CommitDate: Wed Nov 18 13:55:59 2020 +0100

tdf#34686 calc: add option to disable paste with enter key

Change-Id: Ie20a8931a16f6609ac5be23032a0b2e3a7ad1784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95627
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 0762279bf3db..5b3a2043e63b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -754,6 +754,14 @@
 
 false
   
+  
+
+
+  Press Enter to paste and clear clipboard
+  Press Enter to paste and clear clipboard
+
+true
+  
   
 
 
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 4cff5d14cf48..52811ee93c5c 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,6 +38,7 @@ private:
 boolbTextWysiwyg;
 boolbReplCellsWarn;
 boolbLegacyCellSelection;
+boolbEnterPasteMode;
 
 public:
 ScInputOptions();
@@ -68,6 +69,8 @@ public:
 boolGetReplaceCellsWarn() const { return bReplCellsWarn; }
 voidSetLegacyCellSelection(bool bSet)   { bLegacyCellSelection = 
bSet; }
 boolGetLegacyCellSelection() const  { return 
bLegacyCellSelection; }
+voidSetEnterPasteMode(bool bSet){ bEnterPasteMode = bSet; }
+boolGetEnterPasteMode() const   { return bEnterPasteMode; }
 };
 
 // CfgItem for input options
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b493545ec810..e80825624dea 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -113,6 +113,8 @@
 // misc:
 #define SID_LINKS   (SC_VIEW_START + 60)
 #define SID_INSERT_SMATH(SC_VIEW_START + 63)
+// Put this here since all available slots for "SC_INPUT" are taken
+#define SID_SC_INPUT_ENTER_PASTE_MODE (SC_VIEW_START + 64)
 #define SID_MIRROR_VERTICAL (SC_VIEW_START + 65)
 #define SID_MIRROR_HORIZONTAL   (SC_VIEW_START + 66)
 #define SID_CELL_FORMAT_RESET   (SC_VIEW_START + 67)
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 0ceefd1fa9f1..380c4391f307 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -69,6 +69,7 @@ void ScInputOptions::SetDefaults()
 #define SCINPUTOPT_TEXTWYSIWYG 9
 #define SCINPUTOPT_REPLCELLSWARN  10
 #define SCINPUTOPT_LEGACY_CELL_SELECTION  11
+#define SCINPUTOPT_ENTER_PASTE_MODE   12
 
 Sequence ScInputCfg::GetPropertyNames()
 {
@@ -83,7 +84,8 @@ Sequence ScInputCfg::GetPropertyNames()
 "UseTabCol",// SCINPUTOPT_USETABCOL
 "UsePrinterMetrics",// SCINPUTOPT_TEXTWYSIWYG
 "ReplaceCellsWarning",  // SCINPUTOPT_REPLCELLSWARN
-"LegacyCellSelection"}; // SCINPUTOPT_LEGACY_CELL_SELECTION
+"LegacyCellSelection",  // SCINPUTOPT_LEGACY_CELL_SELECTION
+"EnterPasteMode"};  // SCINPUTOPT_ENTER_PASTE_MODE
 }
 
 ScInputCfg::ScInputCfg() :
@@ -142,6 +144,9 @@ ScInputCfg::ScInputCfg() :
 case SCINPUTOPT_LEGACY_CELL_SELECTION:
 SetLegacyCellSelection( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
 break;
+case SCINPUTOPT_ENTER_PASTE_MODE:
+SetEnterPasteMode( ScUnoHelpFunctions::GetBoolFromAny( 
pValues[nProp] ) );
+break;
 }
 }
 }
@@ -193,6 +198,9 @@ void ScInputCfg::ImplCommit()
 case SCINPUTOPT_LEGACY_CELL_SELECTION:
 pValues[nProp] <<= GetLegacyCellSelection();
 break;
+case SCINPUTOPT_ENTER_PASTE_MODE:
+pValues[nProp] <<= GetEnterPasteMode();
+break;
 }
 }
 PutProperties(aNames, aValues);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index d39c9df9a683..f0a992e774bf 100644
---

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2019-11-27 Thread Noel Grandin (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   10 +++-
 sc/inc/defaultsoptions.hxx   |3 ++
 sc/source/core/data/documen2.cxx |   11 +
 sc/source/core/tool/defaultsoptions.cxx  |   17 +--
 sc/source/ui/inc/tpdefaults.hxx  |1 
 sc/source/ui/optdlg/tpdefaults.cxx   |   11 -
 sc/uiconfig/scalc/ui/optdefaultpage.ui   |   14 
 7 files changed, 63 insertions(+), 4 deletions(-)

New commits:
commit 1c8b8e97eb6127e430c1dc0fc3578cec94371fd7
Author: Noel Grandin 
AuthorDate: Mon Nov 25 13:03:42 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 27 13:10:45 2019 +0100

sc: rowcol: tdf#50916 add UI to turn jumbo sheets on

Change-Id: I9e50c38f38acdf5a275b125e9e421a6c6af6d590
Reviewed-on: https://gerrit.libreoffice.org/83661
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 1517514c903d..a7f683a4fec5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1974,7 +1974,15 @@
 Option to set the prefix name for new sheet tabs
   
 
-  
+
+  
+  
+Enable very large spreadsheets (16m rows, 16384 cols)
+Jumbo sheets
+  
+  false
+
+
 
 
 
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index dd48dd83d4f9..1afef1a58b34 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -20,6 +20,7 @@ class SC_DLLPUBLIC ScDefaultsOptions
 private:
 SCTAB nInitTabCount; // number of Tabs for new Spreadsheet doc
 OUString aInitTabPrefix;  // The Tab prefix name in new Spreadsheet doc
+bool bJumboSheets;
 
 public:
 ScDefaultsOptions();
@@ -30,6 +31,8 @@ public:
 void   SetInitTabCount( SCTAB nTabs) { nInitTabCount = nTabs; }
 void   SetInitTabPrefix(const OUString& aPrefix) { aInitTabPrefix = 
aPrefix; }
 const OUString& GetInitTabPrefix() const { return aInitTabPrefix; }
+bool   GetInitJumboSheets() const   { return bJumboSheets; }
+void   SetInitJumboSheets( bool b) { bJumboSheets = b; }
 
 booloperator== ( const ScDefaultsOptions& rOpt ) const;
 
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7271fdef0d43..a779371f83b7 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -50,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -168,6 +170,15 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 mbDocShellRecalc(false),
 mnMutationGuardFlags(0)
 {
+const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions();
+if (rOpt.GetInitJumboSheets())
+{
+mnMaxCol = 16384;
+mnMaxRow = 16 * 1000 * 1000;
+}
+maPreviewSelection = { mnMaxRow, mnMaxCol };
+aCurTextWidthCalcPos = { MaxCol(), 0, 0 };
+
 SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
 
 eSrcSet = osl_getThreadTextEncoding();
diff --git a/sc/source/core/tool/defaultsoptions.cxx 
b/sc/source/core/tool/defaultsoptions.cxx
index 2270c61351e7..af8b5fc7b60b 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -32,12 +32,14 @@ void ScDefaultsOptions::SetDefaults()
 {
 nInitTabCount  = 1;
 aInitTabPrefix = ScResId(STR_TABLE_DEF); // Default Prefix "Sheet"
+bJumboSheets = false;
 }
 
 bool ScDefaultsOptions::operator==( const ScDefaultsOptions& rOpt ) const
 {
 return rOpt.nInitTabCount  == nInitTabCount
-&& rOpt.aInitTabPrefix == aInitTabPrefix;
+&& rOpt.aInitTabPrefix == aInitTabPrefix
+&& rOpt.bJumboSheets == bJumboSheets;
 }
 
 ScTpDefaultsItem::ScTpDefaultsItem( const ScDefaultsOptions& rOpt ) :
@@ -67,17 +69,21 @@ SfxPoolItem* ScTpDefaultsItem::Clone( SfxItemPool * ) const
 
 #define SCDEFAULTSOPT_TAB_COUNT  0
 #define SCDEFAULTSOPT_TAB_PREFIX 1
+#define SCDEFAULTSOPT_JUMBO_SHEETS 2
 
 Sequence ScDefaultsCfg::GetPropertyNames()
 {
 return {"Sheet/SheetCount",   // SCDEFAULTSOPT_TAB_COUNT
-"Sheet/SheetPrefix"}; // SCDEFAULTSOPT_TAB_PREFIX
+"Sheet/SheetPrefix",  // SCDEFAULTSOPT_TAB_PREFIX
+"Sheet/JumboSheets"};  // SCDEFAULTSOPT_JUMBO_SHEETS
+
 }
 
 ScDefaultsCfg::ScDefaultsCfg() :
 ConfigItem( CFGPATH_FORMULA )
 {
 OUString aPrefix;
+bool bValue;
 
 Sequence aNames = GetPropertyNames();
 Sequence aValues = GetProperties(aNames);
@@ -100,6 +106,10 @@

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2019-05-17 Thread heiko tietze (via logerrit) 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +
 sc/inc/viewopti.hxx  |3 +
 sc/source/core/tool/viewopti.cxx |   11 ++-
 sc/source/ui/dialogs/searchresults.cxx   |   11 ++-
 sc/source/ui/inc/searchresults.hxx   |2 +
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |7 
 sc/source/ui/view/viewfun2.cxx   |4 +-
 sc/uiconfig/scalc/ui/searchresults.ui|   23 +--
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   20 -
 10 files changed, 83 insertions(+), 7 deletions(-)

New commits:
commit 019c6ae2ee20a5923055c261abdd22575b69299b
Author: heiko tietze 
AuthorDate: Tue May 7 14:17:48 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 17 10:45:01 2019 +0200

Resolves tdf#87965 - Make 'Search Results' dialog optional

* Option introduced at Tools > Options > Calc > View (Windows)
* Convenience checkbox added to the dialog

Change-Id: Ic30fb302e61e77b0eefacd504f61f955bcf6e595
Reviewed-on: https://gerrit.libreoffice.org/71910
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index e5b3318ff701..1517514c903d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -390,6 +390,14 @@
   
   true
 
+
+  
+  
+Specifies whether a summarizing dialog is displayed after 
search.
+Search summary
+  
+  true
+
   
   
 
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index e768b1ba4a8a..99936ee284bb 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -44,7 +44,8 @@ enum ScViewOption
 VOPT_HELPLINES,
 VOPT_ANCHOR,
 VOPT_PAGEBREAKS,
-VOPT_CLIPMARKS
+VOPT_SUMMARY,
+VOPT_CLIPMARKS,
 };
 
 enum ScVObjType
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 58262ae65ba8..95ad06cfa69f 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -109,6 +109,7 @@ void ScViewOptions::SetDefaults()
 aOptArr[ VOPT_ANCHOR  ] = true;
 aOptArr[ VOPT_PAGEBREAKS  ] = true;
 aOptArr[ VOPT_CLIPMARKS   ] = true;
+aOptArr[ VOPT_SUMMARY ] = true;
 
 aModeArr[VOBJ_TYPE_OLE ]  = VOBJ_MODE_SHOW;
 aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
@@ -214,6 +215,7 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define SCLAYOUTOPT_SHEETTAB7
 #define SCLAYOUTOPT_OUTLINE 8
 #define SCLAYOUTOPT_GRID_ONCOLOR9
+#define SCLAYOUTOPT_SUMMARY 10
 
 #define CFGPATH_DISPLAY "Office.Calc/Content/Display"
 
@@ -251,7 +253,8 @@ Sequence ScViewCfg::GetLayoutPropertyNames()
 "Window/VerticalScroll",// SCLAYOUTOPT_VERTSCROLL
 "Window/SheetTab",  // SCLAYOUTOPT_SHEETTAB
 "Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
-"Line/GridOnColoredCells"}; // SCLAYOUTOPT_GRID_ONCOLOR;
+"Line/GridOnColoredCells",  // SCLAYOUTOPT_GRID_ONCOLOR;
+"Window/SearchSummary"};// SCLAYOUTOPT_SUMMARY
 }
 
 Sequence ScViewCfg::GetDisplayPropertyNames()
@@ -339,6 +342,9 @@ ScViewCfg::ScViewCfg() :
 case SCLAYOUTOPT_OUTLINE:
 SetOption( VOPT_OUTLINER, 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
 break;
+case SCLAYOUTOPT_SUMMARY:
+SetOption( VOPT_SUMMARY, 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
+break;
 }
 }
 }
@@ -503,6 +509,9 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, 
ScLinkConfigItem&, void)
 case SCLAYOUTOPT_OUTLINE:
 pValues[nProp] <<= GetOption( VOPT_OUTLINER );
 break;
+case SCLAYOUTOPT_SUMMARY:
+pValues[nProp] <<= GetOption( VOPT_SUMMARY );
+break;
 }
 }
 aLayoutItem.PutProperties(aNames, aValues);
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 9491123f77e5..8b896b466ab6 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -26,9 +26,10 @@ SearchResultsDlg::SearchResultsDlg(SfxBindings* _pBindings, 
weld::Window* pParen
 , mpDoc(nullptr)
 , mxList(m_xBuilder->weld_tree_view("results"))
 , mxSearchResults(m_xBuilder->weld_label("lbSearchResults"))
+, mxShowDialog(m_xBuilder->weld_check_button("cbShow"))
 {

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2018-03-23 Thread Szymon Kłos 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   32 ---
 sc/inc/viewopti.hxx  |   12 -
 sc/source/core/tool/viewopti.cxx |   39 
 sc/source/ui/inc/tpview.hxx  |5 
 sc/source/ui/optdlg/tpview.cxx   |   31 ---
 sc/source/ui/view/output.cxx |8 
 sc/uiconfig/scalc/ui/tpviewpage.ui   |  140 ---
 7 files changed, 7 insertions(+), 260 deletions(-)

New commits:
commit 154496aefe67b81f80d7c08d12bfb145eddb93ac
Author: Szymon Kłos 
Date:   Fri Mar 23 18:17:31 2018 +0100

Revert "tdf#116241 Customizing value highlighting colors"

This reverts commit fb29b8262488d045a926504725669a362bacb5bb.

Change-Id: I338af7c108bb6386193550ef0603b406c4f7bd99
Reaseon: I will move this to more suitable place "application colors" and 
extend with protected cell backround.
Reviewed-on: https://gerrit.libreoffice.org/51789
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 2fdd0caccd64..18b3612259e6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -262,38 +262,6 @@
   
 Contains settings that affect the window layout.
   
-  
-
-  Contains settings that control highlighting.
-
-
-  
-  
-  
-Specifies the color of highlighted values.
-Value Color
-  
-  255
-
-
-  
-  
-  
-Specifies the color of highlighted formulas.
-Formula Color
-  
-  32768
-
-
-  
-  
-  
-Specifies the color of the highlighted text.
-Text Color
-  
-  0
-
-  
   
 
   Contains settings that control visual aids.
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 965d1ac73b69..8bc3d380b28a 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -94,15 +94,6 @@ public:
 voidSetGridColor( const Color& rCol, const OUString& 
rName ) { aGridCol = rCol; aGridColName = rName;}
 Color const &   GetGridColor( OUString* pStrName = nullptr ) const;
 
-voidSetValueColor( const Color& rCol ) { aValueCol = 
rCol; }
-Color const &   GetValueColor() const { return aValueCol; }
-
-voidSetFormulaColor(const Color& rCol) { aFormulaCol = 
rCol; }
-Color const &   GetFormulaColor() const { return aFormulaCol; }
-
-voidSetTextColor(const Color& rCol) { aTextCol = rCol; 
}
-Color const &   GetTextColor() const { return aTextCol; }
-
 const ScGridOptions&GetGridOptions() const  { 
return aGridOpt; }
 voidSetGridOptions( const ScGridOptions& rNew ) { 
aGridOpt = rNew; }
 SvxGridItem*CreateGridItem() const;
@@ -117,9 +108,6 @@ private:
 Color   aGridCol;
 OUStringaGridColName;
 ScGridOptions   aGridOpt;
-Color   aValueCol;
-Color   aFormulaCol;
-Color   aTextCol;
 };
 
 // Item for the options dialog - View
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index eef9125424bb..d882e82e6fd2 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -132,10 +132,6 @@ void ScViewOptions::SetDefaults()
 aGridCol = SC_STD_GRIDCOLOR;
 aGridColName = ScGlobal::GetRscString( STR_GRIDCOLOR );
 
-aValueCol = COL_LIGHTBLUE;
-aTextCol = COL_BLACK;
-aFormulaCol = COL_GREEN;
-
 aGridOpt.SetDefaults();
 }
 
@@ -157,9 +153,6 @@ ScViewOptions& ScViewOptions::operator=( const 
ScViewOptions& rCpy )
 aGridCol= rCpy.aGridCol;
 aGridColName= rCpy.aGridColName;
 aGridOpt= rCpy.aGridOpt;
-aValueCol   = rCpy.aValueCol;
-aTextCol= rCpy.aTextCol;
-aFormulaCol = rCpy.aFormulaCol;
 
 return *this;
 }
@@ -175,9 +168,6 @@ bool ScViewOptions::operator==( const ScViewOptions& rOpt ) 
const
 bEqual = bEqual && (aGridCol   == rOpt.aGridCol);
 bEqual = bEqual && (aGridColName   == rOpt.aGridColName);
 bEqual = bEqual && (aGridOpt   == rOpt.aGridOpt);
-bEqual = bEqual && (aValueCol  == rOpt.aValueCol);
-bEqual = bEqual && (aTextCol   == rOpt.aTextCol);
-bEqual = bEqual && (aFormulaCol== rOpt.aFormulaCol);
 
 return bEqual;
 }
@@ -240,9 +230,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2018-03-21 Thread Szymon Kłos 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   32 +++
 sc/inc/viewopti.hxx  |   12 +
 sc/source/core/tool/viewopti.cxx |   39 
 sc/source/ui/inc/tpview.hxx  |5 
 sc/source/ui/optdlg/tpview.cxx   |   31 +++
 sc/source/ui/view/output.cxx |8 
 sc/uiconfig/scalc/ui/tpviewpage.ui   |  140 ++-
 7 files changed, 260 insertions(+), 7 deletions(-)

New commits:
commit fb29b8262488d045a926504725669a362bacb5bb
Author: Szymon Kłos 
Date:   Tue Mar 20 16:40:35 2018 +0100

tdf#116241 Customizing value highlighting colors

Change-Id: I5d77e6207d1e29326282d7184c9348e59292977a
Reviewed-on: https://gerrit.libreoffice.org/51653
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 18b3612259e6..2fdd0caccd64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -262,6 +262,38 @@
   
 Contains settings that affect the window layout.
   
+  
+
+  Contains settings that control highlighting.
+
+
+  
+  
+  
+Specifies the color of highlighted values.
+Value Color
+  
+  255
+
+
+  
+  
+  
+Specifies the color of highlighted formulas.
+Formula Color
+  
+  32768
+
+
+  
+  
+  
+Specifies the color of the highlighted text.
+Text Color
+  
+  0
+
+  
   
 
   Contains settings that control visual aids.
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 8bc3d380b28a..965d1ac73b69 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -94,6 +94,15 @@ public:
 voidSetGridColor( const Color& rCol, const OUString& 
rName ) { aGridCol = rCol; aGridColName = rName;}
 Color const &   GetGridColor( OUString* pStrName = nullptr ) const;
 
+voidSetValueColor( const Color& rCol ) { aValueCol = 
rCol; }
+Color const &   GetValueColor() const { return aValueCol; }
+
+voidSetFormulaColor(const Color& rCol) { aFormulaCol = 
rCol; }
+Color const &   GetFormulaColor() const { return aFormulaCol; }
+
+voidSetTextColor(const Color& rCol) { aTextCol = rCol; 
}
+Color const &   GetTextColor() const { return aTextCol; }
+
 const ScGridOptions&GetGridOptions() const  { 
return aGridOpt; }
 voidSetGridOptions( const ScGridOptions& rNew ) { 
aGridOpt = rNew; }
 SvxGridItem*CreateGridItem() const;
@@ -108,6 +117,9 @@ private:
 Color   aGridCol;
 OUStringaGridColName;
 ScGridOptions   aGridOpt;
+Color   aValueCol;
+Color   aFormulaCol;
+Color   aTextCol;
 };
 
 // Item for the options dialog - View
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index d882e82e6fd2..eef9125424bb 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -132,6 +132,10 @@ void ScViewOptions::SetDefaults()
 aGridCol = SC_STD_GRIDCOLOR;
 aGridColName = ScGlobal::GetRscString( STR_GRIDCOLOR );
 
+aValueCol = COL_LIGHTBLUE;
+aTextCol = COL_BLACK;
+aFormulaCol = COL_GREEN;
+
 aGridOpt.SetDefaults();
 }
 
@@ -153,6 +157,9 @@ ScViewOptions& ScViewOptions::operator=( const 
ScViewOptions& rCpy )
 aGridCol= rCpy.aGridCol;
 aGridColName= rCpy.aGridColName;
 aGridOpt= rCpy.aGridOpt;
+aValueCol   = rCpy.aValueCol;
+aTextCol= rCpy.aTextCol;
+aFormulaCol = rCpy.aFormulaCol;
 
 return *this;
 }
@@ -168,6 +175,9 @@ bool ScViewOptions::operator==( const ScViewOptions& rOpt ) 
const
 bEqual = bEqual && (aGridCol   == rOpt.aGridCol);
 bEqual = bEqual && (aGridColName   == rOpt.aGridColName);
 bEqual = bEqual && (aGridOpt   == rOpt.aGridOpt);
+bEqual = bEqual && (aValueCol  == rOpt.aValueCol);
+bEqual = bEqual && (aTextCol   == rOpt.aTextCol);
+bEqual = bEqual && (aFormulaCol== rOpt.aFormulaCol);
 
 return bEqual;
 }
@@ -230,6 +240,9 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define SCLAYOUTOPT_SHEETTAB7
 #define SCLAYOUTOPT_OUTLINE 8
 #define SCLAYOUTOPT_GRID_ONCOLOR9
+#define SCLAYOUTOPT_VALUE_COLOR10
+#define SCLAYOUTOPT_FORMULA_COLOR  11
+#define

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2014-11-20 Thread Tor Lillqvist 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +-
 sc/inc/calcconfig.hxx|   16 +---
 sc/source/core/opencl/openclwrapper.cxx  |   51 +--
 sc/source/core/tool/calcconfig.cxx   |   12 +--
 sc/source/core/tool/formulaopt.cxx   |6 -
 sc/source/ui/optdlg/calcoptionsdlg.cxx   |   25 ++-
 sc/source/ui/optdlg/calcoptionsdlg.hxx   |3 
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui|   31 +
 8 files changed, 62 insertions(+), 90 deletions(-)

New commits:
commit 92c5e9b2812571329a758d54b15273f5fc68f95c
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 20 14:55:37 2014 +0200

Use regexps in the OpenCL blacklist/whitelist

Drop version number bounds, use regexps instead. Not entirely ideal, but as
vendors are free to put arbitrary stuff into the driver version string (part
of which might be numbers, part free text, part significant, part just
informative), just comparing against lower and upper bounds with 
strverscmp()
was not ideal either.

Change-Id: Ic4ef4d8e15f79f1c96e6e03f6c01e62ae92dc2fc

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index aa44d84..c7aac17 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1392,16 +1392,16 @@
 prop oor:name=OpenCLBlackList oor:type=oor:string-list 
oor:nillable=false
   !-- UIHints: Tools - Options  Spreadsheet  Formula --
   info
-descCombinations of (OS, OS version, OpenCL platform vendor, 
OpenCL device name, OpenCL driver version) that are known to be bad. Each entry 
is a string consisting of six parts separated by slashes. In case a slash, 
percent or semicolon occurs inside a part, it is replaced by a percent followed 
by the corresponding number as two hex digits. Any part might contain a single 
asterisk as a wildcard, matching any value, but there is no more generic regexp 
support. Has higher priority than OpenCLWhiteList./desc
+descCombinations of (OS, OS version, OpenCL platform vendor, 
OpenCL device name, OpenCL driver version) that are known to be bad. Each entry 
is a string consisting of five parts separated by slashes. An empty part 
matches anything. In case a slash, percent or semicolon occurs inside a part, 
it is replaced by a percent followed by the corresponding number as two hex 
digits. The parts except OS can contain regular expressions. Inside these 
regular expressions the usual characters .*()[]\ are special and should be 
quoted with a backslash to be interpreted literally. OS should be just one of 
Linux, OS X (including the space) or Windows (without quotes). Has higher 
priority than OpenCLWhiteList./desc
   /info
-  value oor:separator=;Windows/*/Intel(R) 
Corporation/*/9.17.10.2884//value
+  value oor:separator=;Windows//Intel\(R\) 
Corporation//9\.17\.10\.2884/value
 /prop
 prop oor:name=OpenCLWhiteList oor:type=oor:string-list 
oor:nillable=false
   !-- UIHints: Tools - Options  Spreadsheet  Formula --
   info
-descLike OpenCLWhiteList, but for combinations known to be 
good./desc
+descLike OpenCLBlackList, but for combinations known to be 
good./desc
   /info
-  value oor:separator=;Linux/*/Advanced Micro Devices, 
Inc./*/1445.5 (sse2,avx)/;*/*/Advanced Micro Devices, Inc./*/*/;*/*/Intel(R) 
Corporation/*/*/;*/*/NVIDIA Corporation/*/*//value
+  value oor:separator=;Linux//Advanced Micro Devices, 
Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) 
Corporation//;//NVIDIA Corporation///value
 /prop
   /group
   group oor:name=Syntax
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 40a33b6..2b93fa3 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -47,8 +47,7 @@ struct SC_DLLPUBLIC ScCalcConfig
 OUString maOSVersion;
 OUString maPlatformVendor;
 OUString maDevice;
-OUString maDriverVersionMin;
-OUString maDriverVersionMax;
+OUString maDriverVersion;
 
 OpenCLImplMatcher()
 {
@@ -58,14 +57,12 @@ struct SC_DLLPUBLIC ScCalcConfig
   const OUString rOSVersion,
   const OUString rPlatformVendor,
   const OUString rDevice,
-  const OUString rDriverVersionMin,
-  const OUString rDriverVersionMax)
+  const OUString rDriverVersion)
 : maOS(rOS),
   maOSVersion(rOSVersion),
   maPlatformVendor(rPlatformVendor),
   maDevice(rDevice),
-  maDriverVersionMin(rDriverVersionMin),
-

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2014-11-13 Thread Tor Lillqvist 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   12 +++---
 sc/inc/calcconfig.hxx|2 -
 sc/source/core/tool/calcconfig.cxx   |   11 +++--
 sc/source/core/tool/formulaopt.cxx   |   28 +++
 sc/source/ui/optdlg/calcoptionsdlg.cxx   |   14 +++
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui|   16 
 6 files changed, 42 insertions(+), 41 deletions(-)

New commits:
commit 8003afa1f35821e6f8ca8b917b9d446219b6a1ae
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Nov 13 15:24:40 2014 +0200

Blacklist has precedence over whitelist, so order them like that

Change-Id: I0cf00abd582a4be4d385a6ef4f199c7aa0bc

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 42b28bc..8a74759 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1389,19 +1389,19 @@
   /info
   value/
 /prop
-prop oor:name=OpenCLWhiteList oor:type=oor:string-list 
oor:nillable=false
+prop oor:name=OpenCLBlackList oor:type=oor:string-list 
oor:nillable=false
   !-- UIHints: Tools - Options  Spreadsheet  Formula --
   info
-descCombinations of (OS, OS version, OpenCL platform vendor, 
OpenCL device name, OpenCL driver version) that are known to be good. Has 
higher priority than OpenCLBlackList. Each entry is a string consisting of five 
parts separated by slashes. In case a slash occurs inside a part, it is 
prefixed by a backslash. And in case a backslash occurs inside a part, it is 
also prefixed by another backslash. Any part might contain a single asterisk as 
a wildcard, matching any value, but there is no more generic regexp 
support./desc
+descCombinations of (OS, OS version, OpenCL platform vendor, 
OpenCL device name, OpenCL driver version) that are known to be bad. Each entry 
is a string consisting of six parts separated by slashes. In case a slash, 
percent or semicolon occurs inside a part, it is replaced by a percent followed 
by the corresponding number as two hex digits. Any part might contain a single 
asterisk as a wildcard, matching any value, but there is no more generic regexp 
support. Has higher priority than OpenCLWhiteList./desc
   /info
-  value oor:separator=;Linux/*/Advanced Micro Devices, 
Inc./*/1445.5 (sse2,avx)//value
+  value oor:separator=;Windows/*/Intel(R) 
Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, 
Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4/value
 /prop
-prop oor:name=OpenCLBlackList oor:type=oor:string-list 
oor:nillable=false
+prop oor:name=OpenCLWhiteList oor:type=oor:string-list 
oor:nillable=false
   !-- UIHints: Tools - Options  Spreadsheet  Formula --
   info
-descLike OpenCLWhiteList, but for combinations known to be 
bad./desc
+descLike OpenCLWhiteList, but for combinations known to be 
good./desc
   /info
-  value oor:separator=;Windows/*/Intel(R) 
Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, 
Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4/value
+  value oor:separator=;Linux/*/Advanced Micro Devices, 
Inc./*/1445.5 (sse2,avx)//value
 /prop
   /group
   group oor:name=Syntax
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index d46fa84..40a33b6 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -114,8 +114,8 @@ struct SC_DLLPUBLIC ScCalcConfig
 
 typedef std::setOpenCLImplMatcher OpenCLImplMatcherSet;
 
-OpenCLImplMatcherSet maOpenCLWhiteList;
 OpenCLImplMatcherSet maOpenCLBlackList;
+OpenCLImplMatcherSet maOpenCLWhiteList;
 
 ScCalcConfig();
 
diff --git a/sc/source/core/tool/calcconfig.cxx 
b/sc/source/core/tool/calcconfig.cxx
index 0d9b769..8825ac3 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -45,10 +45,10 @@ void ScCalcConfig::setOpenCLConfigToDefault()
 maOpenCLSubsetOpCodes.insert(ocAverage);
 maOpenCLSubsetOpCodes.insert(ocSumIfs);
 
-maOpenCLWhiteList.insert(OpenCLImplMatcher(Linux, *, Advanced Micro 
Devices, Inc., *, 1445.5 (sse2,avx), ));
-
 maOpenCLBlackList.insert(OpenCLImplMatcher(Windows, *, Intel(R) 
Corporation, *, 9.17.10.2884, ));
 maOpenCLBlackList.insert(OpenCLImplMatcher(SuperOS, *, Big Corp, 
Inc., Whizz\\Grafix, 4.2/beta;3, 4.4));
+
+maOpenCLWhiteList.insert(OpenCLImplMatcher(Linux, *, Advanced Micro 
Devices, Inc., *, 1445.5 (sse2,avx), ));
 }
 
 void ScCalcConfig::reset()
@@ -76,8 +76,9 @@ bool ScCalcConfig::operator== (const ScCalcConfig r) const
maOpenCLDevice == r.maOpenCLDevice 
mnOpenCLMinimumFormulaGroupSize == 
r.mnOpenCLMinimumFormulaGroupSize 
maOpenCLSubsetOpCodes == r.maOpenCLSubsetOpCodes 
+

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2014-10-04 Thread Kohei Yoshida 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 
 sc/inc/column.hxx |2 
 sc/inc/document.hxx   |5 ++
 sc/inc/sccommands.h   |1 
 sc/inc/table.hxx  |2 
 sc/source/core/data/column4.cxx   |   24 
++
 sc/source/core/data/document10.cxx|   18 
+++
 sc/source/core/data/table7.cxx|   12 +
 sc/source/ui/view/cellsh.cxx  |6 ++
 sc/uiconfig/scalc/menubar/menubar.xml |1 
 10 files changed, 72 insertions(+), 1 deletion(-)

New commits:
commit f3fae7d3c64db62568290f105d8404f037793945
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Sat Oct 4 13:17:01 2014 -0400

Add menu entry for the formula to value feature.

Not sure 100% if that's the best place for this.  Feel free to move it
to a better place.

Change-Id: Id66a92e1184e988bd71f7d845ea370b021c02c21

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index d81f35b..38e9dc2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1711,7 +1711,7 @@
   /node
   node oor:name=.uno:ConvertFormulaToValue oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USConvert Formula to Value/value
+  value xml:lang=en-USFormula to Value/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index c694513..9398d24 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -311,6 +311,8 @@ public:
 
 bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
 
+bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
+
 void CloneFormulaCell( const ScFormulaCell rSrc, const 
std::vectorsc::RowSpan rRanges );
 
 svl::SharedString GetSharedString( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 41fcffb..063c9f6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -866,6 +866,11 @@ public:
 
 bool SetFormulaCells( const ScAddress rPos, std::vectorScFormulaCell* 
rCells );
 
+/**
+ * Check if there is at least one formula cell in specified range.
+ */
+bool HasFormulaCell( const ScRange rRange ) const;
+
 SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
 SCCOL nCol2, SCROW nRow2,
 const ScMarkData rMark,
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 3a2fb44..8cfbd99 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -105,6 +105,7 @@
 #define CMD_FID_TAB_MENU_SET_TAB_BG_COLOR   .uno:SetTabBgColor
 #define CMD_FID_TAB_SET_TAB_BG_COLOR.uno:TabBgColor
 #define CMD_SID_MANAGE_XML_SOURCE   .uno:ManageXMLSource
+#define CMD_SID_CONVERT_FORMULA_TO_VALUE
.uno:ConvertFormulaToValue
 
 #endif
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e0c6e21..30df498 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -351,6 +351,8 @@ public:
 
 bool SetFormulaCells( SCCOL nCol, SCROW nRow, std::vectorScFormulaCell* 
rCells );
 
+bool HasFormulaCell( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) 
const;
+
 svl::SharedString GetSharedString( SCCOL nCol, SCROW nRow ) const;
 
 voidSetValue( SCCOL nCol, SCROW nRow, const double rVal );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index a577e7a..10b0642 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1107,4 +1107,28 @@ void ScColumn::CollectListeners( 
std::vectorSvtListener* rListeners, SCROW nR
 sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1, 
nRow2, aFunc);
 }
 
+namespace {
+
+struct FindAnyFormula
+{
+bool operator() ( size_t /*nRow*/, const ScFormulaCell* /*pCell*/ ) const
+{
+return true;
+}
+};
+
+}
+
+bool ScColumn::HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const
+{
+if (nRow2  nRow1 || !ValidRow(nRow1) || !ValidRow(nRow2))
+return false;
+
+FindAnyFormula aFunc;
+std::pairsc::CellStoreType::const_iterator, size_t aRet =
+sc::FindFormula(maCells, nRow1, nRow2, aFunc);
+
+return aRet.first != maCells.end();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index 183e8e5..5689a68 100644
--- a/sc/source/core/data/document10.cxx
+++

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2013-11-04 Thread Eilidh McAdam 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 ++
 sc/inc/printopt.hxx  |3 +
 sc/inc/table.hxx |1 
 sc/source/core/data/table1.cxx   |3 -
 sc/source/core/data/table5.cxx   |   39 +--
 sc/source/core/tool/printopt.cxx |   20 ++-
 sc/source/ui/inc/tpprint.hxx |1 
 sc/source/ui/optdlg/tpprint.cxx  |7 ++
 sc/uiconfig/scalc/ui/optdlg.ui   |   16 ++
 9 files changed, 76 insertions(+), 21 deletions(-)

New commits:
commit 7e4f8eb5eff642c7fc8bfa665289d55a1c5b054b
Author: Eilidh McAdam eil...@lanedo.com
Date:   Sat Nov 2 20:35:44 2013 +

fdo#40788: Allow manual breaks in Calc to be forced

If the scale settings specify that the print ranges must be scaled
across a specific number of pages, the default behaviour is to ignore
breaks to avoid the case where breaks force more pages than specified.
Here, an option under Calc - Print - Pages is added so that the user
can specify that manual row and column breaks should be forced.

Change-Id: I445cd7ce9e16e4ec2d0c320f059edad62b40f22d
Reviewed-on: https://gerrit.libreoffice.org/6531
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 4c583a4..0cdb9d5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1659,6 +1659,13 @@
   /info
   valuefalse/value
 /prop
+prop oor:name=ForceBreaks oor:type=xs:boolean 
oor:nillable=false
+  info
+descSpecifies whether manual row and column breaks should be 
forced, regardless of sheet scale settings./desc
+labelForce manual breaks/label
+  /info
+  valuefalse/value
+/prop
   /group
   group oor:name=Other
 info
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 7148c68..ff1fd67 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -29,6 +29,7 @@ class SC_DLLPUBLIC ScPrintOptions
 private:
 sal_BoolbSkipEmpty;
 sal_BoolbAllSheets;
+sal_BoolbForceBreaks;
 
 public:
 ScPrintOptions();
@@ -39,6 +40,8 @@ public:
 voidSetSkipEmpty( sal_Bool bVal )   { bSkipEmpty = bVal; }
 sal_BoolGetAllSheets() const{ return bAllSheets; }
 voidSetAllSheets( sal_Bool bVal )   { bAllSheets = bVal; }
+sal_BoolGetForceBreaks() const  { return bForceBreaks; }
+voidSetForceBreaks( sal_Bool bVal ) { bForceBreaks = bVal; }
 
 voidSetDefaults();
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 394847f..126b0ae 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -194,6 +194,7 @@ private:
 boolbPrintEntireSheet:1;
 boolbActiveScenario:1;
 boolmbPageBreaksValid:1;
+boolmbForceBreaks:1;
 
 friend class ScDocument;// for FillInfo
 friend class ScValueIterator;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index ca8a07c..4eed3b0 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -271,7 +271,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const 
OUString rNewName,
 bGlobalKeepQuery(false),
 bPrintEntireSheet(true),
 bActiveScenario(false),
-mbPageBreaksValid(false)
+mbPageBreaksValid(false),
+mbForceBreaks(false)
 {
 
 if (bColInfo)
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 0392b21..8c8d6bf 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -38,11 +38,14 @@
 #include segmenttree.hxx
 #include columniterator.hxx
 #include globalnames.hxx
+#include scmod.hxx
+#include printopt.hxx
 
 #include com/sun/star/sheet/TablePageBreakData.hpp
 
 #include algorithm
 #include limits
+#include iostream
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::sheet::TablePageBreakData;
@@ -66,7 +69,8 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 if (!bPageSizeValid)
 return;
 
-if (mbPageBreaksValid)
+// Always update breaks if force breaks option has changed
+if (mbPageBreaksValid  mbForceBreaks == 
SC_MOD()-GetPrintOptions().GetForceBreaks())
 return;
 }
 
@@ -120,24 +124,29 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 }
 
 // get bSkipColBreaks/bSkipRowBreaks flags:
-
+// fdo#40788 - print range scale settings can cause manual breaks to be
+// ignored (see below). This behaviour may now be

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2013-08-16 Thread Tomaž Vajngerl 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +++
 sc/inc/inputopt.hxx  |3 +
 sc/inc/sc.hrc|3 +
 sc/source/core/tool/inputopt.cxx |   34 +--
 sc/source/ui/app/scmod.cxx   |   10 
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   14 ++
 sc/source/ui/view/tabview2.cxx   |   14 --
 sc/uiconfig/scalc/ui/scgeneralpage.ui|   20 
 9 files changed, 91 insertions(+), 16 deletions(-)

New commits:
commit 462b28770e4fa3dfa6fe4af71a6776cceb4c4640
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Fri Aug 16 17:15:34 2013 +0200

fdo#37230 Add legacy cell selection behavior and config. option

When selecting cells with ctrl+shift, the legacy behaviour was to
take in account to which cell the cursor moved. This allowed the
user to make some convenient selections. This behaviour can now be
turned on with a switch in the configuration (Tools  Options 
Calc  General  Input Settings  Use legacy cursor movement
behavior when selecting).

Change-Id: I00ae7b4ee001b416cc680c7a650631daec71e51b

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index b396438..ada4416 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -714,6 +714,14 @@
 /info
 valuetrue/value
   /prop
+  prop oor:name=LegacyCellSelection oor:type=xs:boolean 
oor:nillable=false
+!-- UIHints: Tools - Options - Spreadsheet - General - [Section] 
Input settings --
+info
+  descUse legacy behaviour when selecting cells/desc
+  labelUse legacy behaviour when selecting cells/label
+/info
+valuetrue/value
+  /prop
   prop oor:name=LastFunctions oor:type=oor:int-list 
oor:nillable=false
 !-- OldPath: Calc/Input --
 !-- OldLocation: Soffice.cfg --
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index be5095a..33e282a 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,6 +38,7 @@ private:
 sal_BoolbUseTabCol;
 sal_BoolbTextWysiwyg;
 sal_BoolbReplCellsWarn;
+sal_BoolbLegacyCellSelection;
 
 public:
 ScInputOptions();
@@ -66,6 +67,8 @@ public:
 sal_BoolGetTextWysiwyg() const  { return bTextWysiwyg;   }
 voidSetReplaceCellsWarn(sal_Bool bSet)  { bReplCellsWarn = bSet; }
 sal_BoolGetReplaceCellsWarn() const { return bReplCellsWarn; }
+voidSetLegacyCellSelection(sal_Bool bSet)   { bLegacyCellSelection 
= bSet; }
+sal_BoolGetLegacyCellSelection() const  { return 
bLegacyCellSelection; }
 
 const ScInputOptions   operator=   ( const ScInputOptions rOpt );
 };
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8611337..ca208ea 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -84,6 +84,9 @@
 #define FID_SCALESTATUS (SC_VIEW_START + 10)
 #define SID_UPDATECHART (SC_VIEW_START + 13)
 
+// TabPage entry - Legacy selection
+#define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+
 // Format options
 #define SID_SCFORMULAOPTIONS(SC_VIEW_START + 20)
 #define SID_SCDEFAULTSOPTIONS   (SC_VIEW_START + 21)
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 6f056d6..da72057 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -68,6 +68,7 @@ void ScInputOptions::SetDefaults()
 bUseTabCol  = false;
 bTextWysiwyg= false;
 bReplCellsWarn  = sal_True;
+bLegacyCellSelection = false;
 }
 
 //
@@ -84,6 +85,7 @@ const ScInputOptions ScInputOptions::operator=( const 
ScInputOptions rCpy )
 bUseTabCol  = rCpy.bUseTabCol;
 bTextWysiwyg= rCpy.bTextWysiwyg;
 bReplCellsWarn  = rCpy.bReplCellsWarn;
+bLegacyCellSelection = rCpy.bLegacyCellSelection;
 
 return *this;
 }
@@ -95,17 +97,18 @@ const ScInputOptions ScInputOptions::operator=( const 
ScInputOptions rCpy )
 
 #define CFGPATH_INPUT   Office.Calc/Input
 
-#define SCINPUTOPT_MOVEDIR  0
-#define SCINPUTOPT_MOVESEL  1
-#define SCINPUTOPT_EDTEREDIT2
-#define SCINPUTOPT_EXTENDFMT3
-#define SCINPUTOPT_RANGEFIND4
-#define SCINPUTOPT_EXPANDREFS   5
-#define SCINPUTOPT_MARKHEADER   6
-#define SCINPUTOPT_USETABCOL7
-#define SCINPUTOPT_TEXTWYSIWYG  8
-#define SCINPUTOPT_REPLCELLSWARN9
-#define SCINPUTOPT_COUNT10
+#define SCINPUTOPT_MOVEDIR0
+#define SCINPUTOPT_MOVESEL1