| blob | 3a0e051e53027447ce40c3ffa0ae33b9522cb266 |
1 diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx
2 index 7da03fd..6df4898 100644
3 --- formula/inc/formula/FormulaCompiler.hxx
4 +++ formula/inc/formula/FormulaCompiler.hxx
5 @@ -237,6 +237,8 @@ public:
6 including an address reference convention. */
7 inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
9 + static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
10 +
11 protected:
12 virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
13 virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
14 diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
15 index d031c9a..5834e9e 100644
16 --- formula/source/core/api/FormulaCompiler.cxx
17 +++ formula/source/core/api/FormulaCompiler.cxx
18 @@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
19 rBuffer.append(sal_Unicode('"'));
20 }
21 }
22 +
23 +void FormulaCompiler::UpdateSeparatorsNative(
24 + const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
25 +{
26 + NonConstOpCodeMapPtr xSymbolsNative;
27 + lcl_fillNativeSymbols(xSymbolsNative);
28 + xSymbolsNative->putOpCode(rSep, ocSep);
29 + xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
30 + xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
31 +}
32 +
33 // -----------------------------------------------------------------------------
34 OpCode FormulaCompiler::NextToken()
35 {
36 diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx
37 index 51a6405..bbd92e8 100644
38 --- sc/inc/docoptio.hxx
39 +++ sc/inc/docoptio.hxx
40 @@ -36,6 +36,8 @@
41 #include "scdllapi.h"
42 #include "optutil.hxx"
44 +#include "formula/grammar.hxx"
45 +
46 class SC_DLLPUBLIC ScDocOptions
47 {
48 double fIterEps; // Epsilon-Wert dazu
49 @@ -53,6 +55,11 @@ class SC_DLLPUBLIC ScDocOptions
50 BOOL bDoAutoSpell; // Auto-Spelling
51 BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
52 BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled
53 + ::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax
54 +
55 + ::rtl::OUString aFormulaSepArg;
56 + ::rtl::OUString aFormulaSepArrayRow;
57 + ::rtl::OUString aFormulaSepArrayCol;
59 public:
60 ScDocOptions();
61 @@ -99,6 +106,20 @@ public:
63 void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
64 BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
65 +
66 + void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
67 + ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
68 +
69 + void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; }
70 + ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
71 +
72 + void SetFormulaSepArrayRow(const ::rtl::OUString& rSep) { aFormulaSepArrayRow = rSep; }
73 + ::rtl::OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; }
74 +
75 + void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; }
76 + ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; }
77 +
78 + const LocaleDataWrapper& GetLocaleDataWrapper() const;
79 };
82 @@ -119,6 +140,10 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt)
83 rOpt.bDoAutoSpell = bDoAutoSpell;
84 rOpt.bLookUpColRowNames = bLookUpColRowNames;
85 rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled;
86 + rOpt.eFormulaGrammar = eFormulaGrammar;
87 + rOpt.aFormulaSepArg = aFormulaSepArg;
88 + rOpt.aFormulaSepArrayRow = aFormulaSepArrayRow;
89 + rOpt.aFormulaSepArrayCol = aFormulaSepArrayCol;
90 }
92 inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
93 @@ -138,6 +163,10 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
94 bDoAutoSpell = rCpy.bDoAutoSpell;
95 bLookUpColRowNames = rCpy.bLookUpColRowNames;
96 bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
97 + eFormulaGrammar = rCpy.eFormulaGrammar;
98 + aFormulaSepArg = rCpy.aFormulaSepArg;
99 + aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow;
100 + aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol;
102 return *this;
103 }
104 @@ -160,6 +189,10 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const
105 && rOpt.bDoAutoSpell == bDoAutoSpell
106 && rOpt.bLookUpColRowNames == bLookUpColRowNames
107 && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled
108 + && rOpt.eFormulaGrammar == eFormulaGrammar
109 + && rOpt.aFormulaSepArg == aFormulaSepArg
110 + && rOpt.aFormulaSepArrayRow == aFormulaSepArrayRow
111 + && rOpt.aFormulaSepArrayCol == aFormulaSepArrayCol
112 );
113 }
115 @@ -199,12 +232,15 @@ private:
116 class ScDocCfg : public ScDocOptions
117 {
118 ScLinkConfigItem aCalcItem;
119 + ScLinkConfigItem aFormulaItem;
120 ScLinkConfigItem aLayoutItem;
122 DECL_LINK( CalcCommitHdl, void* );
123 + DECL_LINK( FormulaCommitHdl, void* );
124 DECL_LINK( LayoutCommitHdl, void* );
126 com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames();
127 + com::sun::star::uno::Sequence<rtl::OUString> GetFormulaPropertyNames();
128 com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames();
130 public:
131 diff --git sc/inc/sc.hrc sc/inc/sc.hrc
132 index 7301766..2eba0d8 100644
133 --- sc/inc/sc.hrc
134 +++ sc/inc/sc.hrc
135 @@ -1660,5 +1660,9 @@
136 // Autoformat for DataPilot
137 #define SID_PIVOT_AFMT (SC_OOO_BUILD_START + 4)
139 +// Formula options page
140 +#define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 5)
141 +#define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 6)
142 +
143 #endif
145 diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
146 index ec6c46c..27f9d36 100644
147 --- sc/source/core/data/documen3.cxx
148 +++ sc/source/core/data/documen3.cxx
149 @@ -54,6 +54,7 @@
150 #include "rangelst.hxx"
151 #include "chartarr.hxx"
152 #include "chartlock.hxx"
153 +#include "compiler.hxx"
154 #include "refupdat.hxx"
155 #include "docoptio.hxx"
156 #include "viewopti.hxx"
157 @@ -1771,7 +1772,13 @@ void ScDocument::SetDocOptions( const ScDocOptions& rOpt )
158 *pDocOptions = rOpt;
159 rOpt.GetDate( d,m,y );
161 xPoolHelper->SetFormTableOpt(rOpt);
162 +
163 + SetGrammar( rOpt.GetFormulaSyntax() );
164 +
165 + // Update the separators.
166 + ScCompiler::UpdateSeparatorsNative(
167 + rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow());
168 }
170 const ScViewOptions& ScDocument::GetViewOptions() const
171 diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
172 index ffbb2d9..4338af6 100644
173 --- sc/source/core/tool/docoptio.cxx
174 +++ sc/source/core/tool/docoptio.cxx
175 @@ -38,6 +38,8 @@
177 #include <com/sun/star/uno/Any.hxx>
178 #include <com/sun/star/uno/Sequence.hxx>
179 +#include <com/sun/star/lang/Locale.hpp>
180 +#include <com/sun/star/i18n/LocaleDataItem.hpp>
182 #include "cfgids.hxx"
183 #include "docoptio.hxx"
184 @@ -45,10 +47,13 @@
185 #include "scresid.hxx"
186 #include "sc.hrc"
187 #include "miscuno.hxx"
188 +#include "global.hxx"
190 using namespace utl;
191 using namespace rtl;
192 using namespace com::sun::star::uno;
193 +using ::com::sun::star::lang::Locale;
194 +using ::com::sun::star::i18n::LocaleDataItem;
196 //------------------------------------------------------------------------
198 @@ -100,7 +105,11 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
199 bMatchWholeCell( rCpy.bMatchWholeCell ),
200 bDoAutoSpell( rCpy.bDoAutoSpell ),
201 bLookUpColRowNames( rCpy.bLookUpColRowNames ),
202 - bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled )
203 + bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
204 + eFormulaGrammar( rCpy.eFormulaGrammar ),
205 + aFormulaSepArg( rCpy.aFormulaSepArg ),
206 + aFormulaSepArrayRow( rCpy.aFormulaSepArrayRow ),
207 + aFormulaSepArrayCol( rCpy.aFormulaSepArrayCol )
208 {
209 }
211 @@ -129,6 +138,67 @@ void ScDocOptions::ResetDocOptions()
212 bDoAutoSpell = FALSE;
213 bLookUpColRowNames = TRUE;
214 bFormulaRegexEnabled= TRUE;
215 + eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE;
216 +
217 + do
218 + {
219 + const Locale& rLocale = *ScGlobal::GetLocale();
220 + const OUString& rLang = rLocale.Language;
221 + if (rLang.equalsAscii("ru"))
222 + // Don't do automatic guess for these languages, and fall back to
223 + // the old separator set.
224 + break;
225 +
226 + const LocaleDataWrapper& rLocaleData = GetLocaleDataWrapper();
227 + const OUString& rDecSep = rLocaleData.getNumDecimalSep();
228 + const OUString& rListSep = rLocaleData.getListSep();
229 +
230 + if (!rDecSep.getLength() || !rListSep.getLength())
231 + // Something is wrong. Stick with the default separators.
232 + break;
233 +
234 + sal_Unicode cDecSep = rDecSep.getStr()[0];
235 + sal_Unicode cListSep = rListSep.getStr()[0];
236 +
237 + // Excel by default uses system's list separator as the parameter
238 + // separator, which in English locales is a comma. However, OOo's list
239 + // separator value is set to ';' for all English locales. Because of this
240 + // discrepancy, we will hardcode the separator value here, for now.
241 + if (cDecSep == sal_Unicode('.'))
242 + cListSep = sal_Unicode(',');
243 +
244 + // Special case for de_CH locale.
245 + if (rLocale.Language.equalsAsciiL("de", 2) && rLocale.Country.equalsAsciiL("CH", 2))
246 + cListSep = sal_Unicode(';');
247 +
248 + // by default, the parameter separator equals the locale-specific
249 + // list separator.
250 + aFormulaSepArg = OUString(cListSep);
251 +
252 + if (cDecSep == cListSep && cDecSep != sal_Unicode(';'))
253 + // if the decimal and list separators are equal, set the
254 + // parameter separator to be ';', unless they are both
255 + // semicolon in which case don't change the decimal separator.
256 + aFormulaSepArg = OUString::createFromAscii(";");
257 +
258 + aFormulaSepArrayCol = OUString::createFromAscii(",");
259 + if (cDecSep == sal_Unicode(','))
260 + aFormulaSepArrayCol = OUString::createFromAscii(".");
261 + aFormulaSepArrayRow = OUString::createFromAscii(";");
262 +
263 + return;
264 + }
265 + while (false);
266 +
267 + // Defaults to the old separator values.
268 + aFormulaSepArg = OUString::createFromAscii(";");
269 + aFormulaSepArrayCol = OUString::createFromAscii(";");
270 + aFormulaSepArrayRow = OUString::createFromAscii("|");
271 +}
272 +
273 +const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper() const
274 +{
275 + return *ScGlobal::pLocaleData;
276 }
278 //========================================================================
279 @@ -206,6 +276,13 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
280 #define SCCALCOPT_REGEX 11
281 #define SCCALCOPT_COUNT 12
283 +#define CFGPATH_FORMULA "Office.Calc/Formula"
284 +#define SCFORMULAOPT_GRAMMAR 0
285 +#define SCFORMULAOPT_SEP_ARG 1
286 +#define SCFORMULAOPT_SEP_ARRAY_ROW 2
287 +#define SCFORMULAOPT_SEP_ARRAY_COL 3
288 +#define SCFORMULAOPT_COUNT 4
289 +
290 #define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
292 #define SCDOCLAYOUTOPT_TABSTOP 0
293 @@ -227,7 +304,7 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
294 "Other/Precision", // SCCALCOPT_PRECISION
295 "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
296 "Other/FindLabel", // SCCALCOPT_FINDLABEL
297 - "Other/RegularExpressions" // SCCALCOPT_REGEX
298 + "Other/RegularExpressions", // SCCALCOPT_REGEX
299 };
300 Sequence<OUString> aNames(SCCALCOPT_COUNT);
301 OUString* pNames = aNames.getArray();
302 @@ -237,6 +314,23 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
303 return aNames;
304 }
306 +Sequence<OUString> ScDocCfg::GetFormulaPropertyNames()
307 +{
308 + static const char* aPropNames[] =
309 + {
310 + "Syntax/Grammar", // SCFORMULAOPT_GRAMMAR
311 + "Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG
312 + "Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW
313 + "Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL
314 + };
315 + Sequence<OUString> aNames(SCFORMULAOPT_COUNT);
316 + OUString* pNames = aNames.getArray();
317 + for (int i = 0; i < SCFORMULAOPT_COUNT; ++i)
318 + pNames[i] = OUString::createFromAscii(aPropNames[i]);
319 +
320 + return aNames;
321 +}
322 +
323 Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
324 {
325 static const char* aPropNames[] =
326 @@ -257,6 +351,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
328 ScDocCfg::ScDocCfg() :
329 aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
330 + aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)),
331 aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
332 {
333 sal_Int32 nIntVal = 0;
334 @@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() :
336 SetDate( nDateDay, nDateMonth, nDateYear );
338 + aNames = GetFormulaPropertyNames();
339 + aValues = aFormulaItem.GetProperties(aNames);
340 + aFormulaItem.EnableNotification(aNames);
341 + pValues = aValues.getConstArray();
342 + if (aValues.getLength() == aNames.getLength())
343 + {
344 + for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
345 + {
346 + switch (nProp)
347 + {
348 + case SCFORMULAOPT_GRAMMAR:
349 + {
350 + ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
351 +
352 + do
353 + {
354 + if (!(pValues[nProp] >>= nIntVal))
355 + // extractino failed.
356 + break;
357 +
358 + switch (nIntVal)
359 + {
360 + case 0: // Calc A1
361 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
362 + break;
363 + case 1: // Excel A1
364 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
365 + break;
366 + case 2: // Excel R1C1
367 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
368 + break;
369 + }
370 + }
371 + while (false);
372 + SetFormulaSyntax(eGram);
373 + }
374 + break;
375 + case SCFORMULAOPT_SEP_ARG:
376 + {
377 + OUString aSep;
378 + if ((pValues[nProp] >>= aSep) && aSep.getLength())
379 + SetFormulaSepArg(aSep);
380 + }
381 + break;
382 + case SCFORMULAOPT_SEP_ARRAY_ROW:
383 + {
384 + OUString aSep;
385 + if ((pValues[nProp] >>= aSep) && aSep.getLength())
386 + SetFormulaSepArrayRow(aSep);
387 + }
388 + break;
389 + case SCFORMULAOPT_SEP_ARRAY_COL:
390 + {
391 + OUString aSep;
392 + if ((pValues[nProp] >>= aSep) && aSep.getLength())
393 + SetFormulaSepArrayCol(aSep);
394 + }
395 + break;
396 + }
397 + }
398 + }
399 + aFormulaItem.SetCommitLink( LINK(this, ScDocCfg, FormulaCommitHdl) );
400 +
401 aNames = GetLayoutPropertyNames();
402 aValues = aLayoutItem.GetProperties(aNames);
403 aLayoutItem.EnableNotification(aNames);
404 @@ -410,6 +568,43 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG )
405 return 0;
406 }
408 +IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG )
409 +{
410 + Sequence<OUString> aNames = GetFormulaPropertyNames();
411 + Sequence<Any> aValues(aNames.getLength());
412 + Any* pValues = aValues.getArray();
413 +
414 + for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
415 + {
416 + switch (nProp)
417 + {
418 + case SCFORMULAOPT_GRAMMAR :
419 + {
420 + sal_Int32 nVal = 0;
421 + switch (GetFormulaSyntax())
422 + {
423 + case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1: nVal = 1; break;
424 + case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1: nVal = 2; break;
425 + }
426 + pValues[nProp] <<= nVal;
427 + }
428 + break;
429 + case SCFORMULAOPT_SEP_ARG:
430 + pValues[nProp] <<= GetFormulaSepArg();
431 + break;
432 + case SCFORMULAOPT_SEP_ARRAY_ROW:
433 + pValues[nProp] <<= GetFormulaSepArrayRow();
434 + break;
435 + case SCFORMULAOPT_SEP_ARRAY_COL:
436 + pValues[nProp] <<= GetFormulaSepArrayCol();
437 + break;
438 + }
439 + }
440 + aFormulaItem.PutProperties(aNames, aValues);
441 +
442 + return 0;
443 +}
444 +
445 IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG )
446 {
447 Sequence<OUString> aNames = GetLayoutPropertyNames();
448 @@ -439,6 +634,7 @@ void ScDocCfg::SetOptions( const ScDocOptions& rNew )
449 *(ScDocOptions*)this = rNew;
451 aCalcItem.SetModified();
452 + aFormulaItem.SetModified();
453 aLayoutItem.SetModified();
454 }
456 diff --git sc/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx
457 index bc0a91f..2362c23 100644
458 --- sc/source/ui/app/scmod.cxx
459 +++ sc/source/ui/app/scmod.cxx
460 @@ -2134,6 +2134,13 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
461 pRet = (*ScTpCalcOptionsCreate)(pParent, rSet);
462 }
463 break;
464 + case SID_SC_TP_FORMULA:
465 + {
466 + ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA);
467 + if (ScTpFormulaOptionsCreate)
468 + pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet);
469 + }
470 + break;
471 case SID_SC_TP_CHANGES:
472 { //CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet);
473 ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
474 diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
475 index de9b284..7e6e248 100644
476 --- sc/source/ui/attrdlg/scdlgfact.cxx
477 +++ sc/source/ui/attrdlg/scdlgfact.cxx
478 @@ -76,6 +76,7 @@
479 #include "tpstat.hxx" //add for ScDocStatPage
480 #include "tpusrlst.hxx" //add for ScTpUserLists
481 #include "tpview.hxx" //add for ScTpContentOptions
482 +#include "tpformula.hxx"
484 // ause
486 @@ -1432,6 +1433,8 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
487 case RID_SCPAGE_CALC :
488 return ScTpCalcOptions::Create;
489 //break;
490 + case RID_SCPAGE_FORMULA:
491 + return ScTpFormulaOptions::Create;
492 case RID_SCPAGE_PRINT :
493 return ScTpPrintOptions::Create;
494 //break;
495 diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
496 index e834a11..aaeb33d 100644
497 --- sc/source/ui/inc/optdlg.hrc
498 +++ sc/source/ui/inc/optdlg.hrc
499 @@ -52,6 +52,7 @@
500 #define TP_LAYOUT 12
501 #define TP_INPUT 13
502 #define TP_CHANGES 14
503 +#define TP_FORMULA 15
505 // TP_CALC:
506 #define BTN_ITERATE 1
507 @@ -192,3 +193,16 @@
508 #define CB_TEXTFMT 78
509 #define CB_REPLWARN 79
511 +
512 +// TP_FORMULA
513 +#define FL_FORMULA_OPTIONS 80
514 +#define FT_FORMULA_SYNTAX 81
515 +#define LB_FORMULA_SYNTAX 82
516 +#define FL_FORMULA_SEPS 83
517 +#define FT_FORMULA_SEP_ARG 84
518 +#define ED_FORMULA_SEP_ARG 85
519 +#define FT_FORMULA_SEP_ARRAY_R 86
520 +#define ED_FORMULA_SEP_ARRAY_R 87
521 +#define FT_FORMULA_SEP_ARRAY_C 88
522 +#define ED_FORMULA_SEP_ARRAY_C 89
523 +#define BTN_FORMULA_SEP_RESET 90
524 diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx
525 new file mode 100644
526 index 0000000..054655e
527 --- /dev/null
528 +++ sc/source/ui/inc/tpformula.hxx
529 @@ -0,0 +1,96 @@
530 +/*************************************************************************
531 + *
532 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
533 + *
534 + * Copyright 2008 by Sun Microsystems, Inc.
535 + *
536 + * OpenOffice.org - a multi-platform office productivity suite
537 + *
538 + * $RCSfile: tpcalc.hxx,v $
539 + * $Revision: 1.9 $
540 + *
541 + * This file is part of OpenOffice.org.
542 + *
543 + * OpenOffice.org is free software: you can redistribute it and/or modify
544 + * it under the terms of the GNU Lesser General Public License version 3
545 + * only, as published by the Free Software Foundation.
546 + *
547 + * OpenOffice.org is distributed in the hope that it will be useful,
548 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
549 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
550 + * GNU Lesser General Public License version 3 for more details
551 + * (a copy is included in the LICENSE file that accompanied this code).
552 + *
553 + * You should have received a copy of the GNU Lesser General Public License
554 + * version 3 along with OpenOffice.org. If not, see
555 + * <http://www.openoffice.org/license.html>
556 + * for a copy of the LGPLv3 License.
557 + *
558 + ************************************************************************/
559 +
560 +#ifndef SC_TPFORMULA_HXX
561 +#define SC_TPFORMULA_HXX
562 +
563 +#include <sfx2/tabdlg.hxx>
564 +#include <vcl/fixed.hxx>
565 +#include <vcl/lstbox.hxx>
566 +#include <vcl/edit.hxx>
567 +#include <vcl/button.hxx>
568 +
569 +#include <memory>
570 +
571 +class ScDocOptions;
572 +class SfxItemSet;
573 +class Window;
574 +
575 +class ScTpFormulaOptions : public SfxTabPage
576 +{
577 +public:
578 + static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
579 +
580 +// static USHORT* GetRanges();
581 + virtual BOOL FillItemSet(SfxItemSet& rCoreSet);
582 + virtual void Reset( const SfxItemSet& rCoreSet );
583 + virtual int DeactivatePage(SfxItemSet* pSet = NULL);
584 +
585 +private:
586 + explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet);
587 + virtual ~ScTpFormulaOptions();
588 +
589 + void Init();
590 + void ResetSeparators();
591 + void OnFocusSeparatorInput(Edit* pEdit);
592 +
593 + bool IsValidSeparator(const ::rtl::OUString& rSep) const;
594 + bool IsValidSeparatorSet() const;
595 +
596 + DECL_LINK( ButtonHdl, PushButton* );
597 + DECL_LINK( SepModifyHdl, Edit* );
598 + DECL_LINK( SepEditOnFocusHdl, Edit* );
599 +
600 +private:
601 + FixedLine maFlFormulaOpt;
602 + FixedText maFtFormulaSyntax;
603 + ListBox maLbFormulaSyntax;
604 +
605 + FixedLine maFlFormulaSeps;
606 + FixedText maFtSepFuncArg;
607 + Edit maEdSepFuncArg;
608 + FixedText maFtSepArrayCol;
609 + Edit maEdSepArrayCol;
610 + FixedText maFtSepArrayRow;
611 + Edit maEdSepArrayRow;
612 + PushButton maBtnSepReset;
613 +
614 + ::std::auto_ptr<ScDocOptions> mpOldOptions;
615 + ::std::auto_ptr<ScDocOptions> mpNewOptions;
616 +
617 + /** Stores old separator value of currently focused separator edit box.
618 + This value is used to revert undesired value change. */
619 + ::rtl::OUString maOldSepValue;
620 +
621 + sal_Unicode mnDecSep;
622 +};
623 +
624 +
625 +#endif
626 diff --git sc/source/ui/optdlg/makefile.mk sc/source/ui/optdlg/makefile.mk
627 index e8a6d20..cb43db7 100644
628 --- sc/source/ui/optdlg/makefile.mk
629 +++ sc/source/ui/optdlg/makefile.mk
630 @@ -47,6 +47,7 @@ CXXFILES = \
631 tpusrlst.cxx \
632 tpview.cxx \
633 tpcalc.cxx \
634 + tpformula.cxx \
635 tpprint.cxx \
636 opredlin.cxx
638 @@ -54,6 +55,7 @@ SLOFILES = \
639 $(SLO)$/tpusrlst.obj \
640 $(SLO)$/tpview.obj \
641 $(SLO)$/tpcalc.obj \
642 + $(SLO)$/tpformula.obj \
643 $(SLO)$/tpprint.obj \
644 $(SLO)$/opredlin.obj
646 diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx
647 new file mode 100644
648 index 0000000..a27d5a7
649 --- /dev/null
650 +++ sc/source/ui/optdlg/tpformula.cxx
651 @@ -0,0 +1,289 @@
652 +/*************************************************************************
653 + *
654 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
655 + *
656 + * Copyright 2008 by Sun Microsystems, Inc.
657 + *
658 + * OpenOffice.org - a multi-platform office productivity suite
659 + *
660 + * $RCSfile: tpcalc.hxx,v $
661 + * $Revision: 1.9 $
662 + *
663 + * This file is part of OpenOffice.org.
664 + *
665 + * OpenOffice.org is free software: you can redistribute it and/or modify
666 + * it under the terms of the GNU Lesser General Public License version 3
667 + * only, as published by the Free Software Foundation.
668 + *
669 + * OpenOffice.org is distributed in the hope that it will be useful,
670 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
671 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
672 + * GNU Lesser General Public License version 3 for more details
673 + * (a copy is included in the LICENSE file that accompanied this code).
674 + *
675 + * You should have received a copy of the GNU Lesser General Public License
676 + * version 3 along with OpenOffice.org. If not, see
677 + * <http://www.openoffice.org/license.html>
678 + * for a copy of the LGPLv3 License.
679 + *
680 + ************************************************************************/
681 +
682 +// MARKER(update_precomp.py): autogen include statement, do not remove
683 +#include "precompiled_sc.hxx"
684 +
685 +#undef SC_DLLIMPLEMENTATION
686 +
687 +
688 +
689 +//------------------------------------------------------------------
690 +
691 +#include "tpformula.hxx"
692 +#include "optdlg.hrc"
693 +#include "scresid.hxx"
694 +#include "formula/grammar.hxx"
695 +#include "docoptio.hxx"
696 +#include "global.hxx"
697 +
698 +#include <unotools/localedatawrapper.hxx>
699 +
700 +#include <com/sun/star/lang/Locale.hpp>
701 +#include <com/sun/star/i18n/LocaleDataItem.hpp>
702 +
703 +using ::rtl::OUString;
704 +using ::com::sun::star::lang::Locale;
705 +using ::com::sun::star::i18n::LocaleDataItem;
706 +
707 +ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) :
708 + SfxTabPage(pParent, ScResId(RID_SCPAGE_FORMULA), rCoreAttrs),
709 +
710 + maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)),
711 + maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
712 + maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
713 + maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
714 + maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
715 + maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
716 + maFtSepArrayCol(this, ScResId(FT_FORMULA_SEP_ARRAY_C)),
717 + maEdSepArrayCol(this, ScResId(ED_FORMULA_SEP_ARRAY_C)),
718 + maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
719 + maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
720 + maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
721 +
722 + mpOldOptions(NULL),
723 + mpNewOptions(NULL),
724 + mnDecSep(0)
725 +{
726 + FreeResource();
727 +
728 + const ScTpCalcItem& rItem = static_cast<const ScTpCalcItem&>(
729 + rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
730 + mpOldOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
731 + mpNewOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
732 +
733 + Init();
734 +}
735 +
736 +ScTpFormulaOptions::~ScTpFormulaOptions()
737 +{
738 +}
739 +
740 +void ScTpFormulaOptions::Init()
741 +{
742 + Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
743 + maBtnSepReset.SetClickHdl(aLink);
744 +
745 + aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl );
746 + maEdSepFuncArg.SetModifyHdl(aLink);
747 + maEdSepArrayCol.SetModifyHdl(aLink);
748 + maEdSepArrayRow.SetModifyHdl(aLink);
749 +
750 + aLink = LINK( this, ScTpFormulaOptions, SepEditOnFocusHdl );
751 + maEdSepFuncArg.SetGetFocusHdl(aLink);
752 + maEdSepArrayCol.SetGetFocusHdl(aLink);
753 + maEdSepArrayRow.SetGetFocusHdl(aLink);
754 +
755 + // Get the decimal separator for current locale.
756 + String aSep = mpOldOptions->GetLocaleDataWrapper().getNumDecimalSep();
757 + mnDecSep = aSep.Len() ? aSep.GetChar(0) : sal_Unicode('.');
758 +}
759 +
760 +void ScTpFormulaOptions::ResetSeparators()
761 +{
762 + ScDocOptions aOpt;
763 + maEdSepFuncArg.SetText(aOpt.GetFormulaSepArg());
764 + maEdSepArrayCol.SetText(aOpt.GetFormulaSepArrayCol());
765 + maEdSepArrayRow.SetText(aOpt.GetFormulaSepArrayRow());
766 +}
767 +
768 +void ScTpFormulaOptions::OnFocusSeparatorInput(Edit* pEdit)
769 +{
770 + if (!pEdit)
771 + return;
772 +
773 + // Make sure the entire text is selected.
774 + xub_StrLen nLen = pEdit->GetText().Len();
775 + Selection aSel(0, nLen);
776 + pEdit->SetSelection(aSel);
777 + maOldSepValue = pEdit->GetText();
778 +}
779 +
780 +bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep) const
781 +{
782 + if (rSep.getLength() != 1)
783 + // Must be one-character long.
784 + return false;
785 +
786 + if (rSep.compareToAscii("a") >= 0 && rSep.compareToAscii("z") <= 0)
787 + return false;
788 +
789 + if (rSep.compareToAscii("A") >= 0 && rSep.compareToAscii("Z") <= 0)
790 + return false;
791 +
792 + sal_Unicode c = rSep.getStr()[0];
793 + switch (c)
794 + {
795 + case '+':
796 + case '-':
797 + case '/':
798 + case '*':
799 + case '<':
800 + case '>':
801 + case '[':
802 + case ']':
803 + case '(':
804 + case ')':
805 + case '"':
806 + case '\'':
807 + // Disallowed characters. Anything else we want to disallow ?
808 + return false;
809 + }
810 +
811 + if (c == mnDecSep)
812 + // decimal separator is not allowed.
813 + return false;
814 +
815 + return true;
816 +}
817 +
818 +bool ScTpFormulaOptions::IsValidSeparatorSet() const
819 +{
820 + // Make sure the column and row separators are different.
821 + String aColStr = maEdSepArrayCol.GetText();
822 + String aRowStr = maEdSepArrayRow.GetText();
823 + if (aColStr == aRowStr)
824 + return false;
825 +
826 + return true;
827 +}
828 +
829 +IMPL_LINK( ScTpFormulaOptions, ButtonHdl, PushButton*, pBtn )
830 +{
831 + if (pBtn == &maBtnSepReset)
832 + ResetSeparators();
833 +
834 + return 0;
835 +}
836 +
837 +IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit*, pEdit )
838 +{
839 + if (!pEdit)
840 + return 0;
841 +
842 + String aStr = pEdit->GetText();
843 + if (aStr.Len() > 1)
844 + {
845 + // In case the string is more than one character long, only grab the
846 + // first character.
847 + aStr = aStr.Copy(0, 1);
848 + pEdit->SetText(aStr);
849 + }
850 +
851 + if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) && maOldSepValue.getLength())
852 + // Invalid separator. Restore the old value.
853 + pEdit->SetText(maOldSepValue);
854 +
855 + OnFocusSeparatorInput(pEdit);
856 + return 0;
857 +}
858 +
859 +IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit )
860 +{
861 + OnFocusSeparatorInput(pEdit);
862 + return 0;
863 +}
864 +
865 +// static
866 +SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet)
867 +{
868 + return new ScTpFormulaOptions(pParent, rCoreSet);
869 +}
870 +
871 +BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
872 +{
873 + ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
874 + switch (maLbFormulaSyntax.GetSelectEntryPos())
875 + {
876 + case 0:
877 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
878 + break;
879 + case 1:
880 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
881 + break;
882 + case 2:
883 + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
884 + break;
885 + }
886 +
887 + mpNewOptions->SetFormulaSyntax(eGram);
888 +
889 + mpNewOptions->SetFormulaSepArg(maEdSepFuncArg.GetText());
890 + mpNewOptions->SetFormulaSepArrayCol(maEdSepArrayCol.GetText());
891 + mpNewOptions->SetFormulaSepArrayRow(maEdSepArrayRow.GetText());
892 +
893 + if (*mpNewOptions != *mpOldOptions)
894 + {
895 + rCoreSet.Put(ScTpCalcItem(GetWhich(SID_SCDOCOPTIONS), *mpNewOptions));
896 + return true;
897 + }
898 + else
899 + return false;
900 +}
901 +
902 +void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/)
903 +{
904 + ::formula::FormulaGrammar::Grammar eGram = mpNewOptions->GetFormulaSyntax();
905 + switch (eGram)
906 + {
907 + case ::formula::FormulaGrammar::GRAM_NATIVE:
908 + maLbFormulaSyntax.SelectEntryPos(0);
909 + break;
910 + case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:
911 + maLbFormulaSyntax.SelectEntryPos(1);
912 + break;
913 + case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:
914 + maLbFormulaSyntax.SelectEntryPos(2);
915 + break;
916 + default:
917 + maLbFormulaSyntax.SelectEntryPos(0);
918 + }
919 +
920 + OUString aSep = mpNewOptions->GetFormulaSepArg();
921 + OUString aSepArrayRow = mpNewOptions->GetFormulaSepArrayRow();
922 + OUString aSepArrayCol = mpNewOptions->GetFormulaSepArrayCol();
923 +
924 + if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
925 + {
926 + // Each separator must be one character long.
927 + maEdSepFuncArg.SetText(aSep);
928 + maEdSepArrayCol.SetText(aSepArrayCol);
929 + maEdSepArrayRow.SetText(aSepArrayRow);
930 + }
931 + else
932 + ResetSeparators();
933 +}
934 +
935 +int ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/)
936 +{
937 + // What's this method for ?
938 + return KEEP_PAGE;
939 +}
940 +
941 diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
942 index 82a1161..2ea00b8 100644
943 --- sc/source/ui/src/optdlg.src
944 +++ sc/source/ui/src/optdlg.src
945 @@ -176,6 +176,105 @@ TabPage RID_SCPAGE_CALC
946 /* */
947 /**************************************************************************/
949 +TabPage RID_SCPAGE_FORMULA
950 +{
951 + HelpId = HID_SCPAGE_FORMULA ;
952 + SVLook = TRUE ;
953 + Hide = TRUE ;
954 + Pos = MAP_APPFONT ( 0 , 0 ) ;
955 + Size = MAP_APPFONT ( 260 , 185 ) ;
956 +
957 + FixedLine FL_FORMULA_OPTIONS
958 + {
959 + Pos = MAP_APPFONT ( 6 , 3 ) ;
960 + Size = MAP_APPFONT ( 248 , 8 ) ;
961 + Text [ en-US ] = "Formula options";
962 + };
963 +
964 + FixedText FT_FORMULA_SYNTAX
965 + {
966 + Pos = MAP_APPFONT ( 21, 16 ) ;
967 + Size = MAP_APPFONT ( 80, 8 ) ;
968 + Text [ en-US ] = "Formula ~syntax" ;
969 + };
970 +
971 + ListBox LB_FORMULA_SYNTAX
972 + {
973 + Border = TRUE ;
974 + Pos = MAP_APPFONT ( 85, 14 ) ;
975 + Size = MAP_APPFONT ( 60, 46 ) ;
976 + DropDown = TRUE ;
977 + StringList [ en-US ] =
978 + {
979 + < "Calc A1" ; Default ; > ;
980 + < "Excel A1" ; Default ; > ;
981 + < "Excel R1C1" ; Default ; > ;
982 + };
983 + };
984 +
985 + FixedLine FL_FORMULA_SEPS
986 + {
987 + Pos = MAP_APPFONT ( 6 , 32 ) ;
988 + Size = MAP_APPFONT ( 248 , 8 ) ;
989 + Text [ en-US ] = "Separators";
990 + };
991 +
992 + FixedText FT_FORMULA_SEP_ARG
993 + {
994 + Pos = MAP_APPFONT ( 21, 45 );
995 + Size = MAP_APPFONT ( 40, 8 );
996 + Text [ en-US ] = "~Function";
997 + };
998 +
999 + Edit ED_FORMULA_SEP_ARG
1000 + {
1001 + Border = TRUE;
1002 + Pos = MAP_APPFONT ( 65, 43 );
1003 + Size = MAP_APPFONT ( 10, 12 );
1004 + };
1005 +
1006 + FixedText FT_FORMULA_SEP_ARRAY_C
1007 + {
1008 + Pos = MAP_APPFONT ( 21, 63 );
1009 + Size = MAP_APPFONT ( 40, 8 );
1010 + Text [ en-US ] = "Array co~lumn";
1011 + };
1012 +
1013 + Edit ED_FORMULA_SEP_ARRAY_C
1014 + {
1015 + Border = TRUE;
1016 + Pos = MAP_APPFONT ( 65, 61 );
1017 + Size = MAP_APPFONT ( 10, 12 );
1018 + };
1019 +
1020 + FixedText FT_FORMULA_SEP_ARRAY_R
1021 + {
1022 + Pos = MAP_APPFONT ( 21, 81 );
1023 + Size = MAP_APPFONT ( 40, 8 );
1024 + Text [ en-US ] = "Array ~row";
1025 + };
1026 +
1027 + Edit ED_FORMULA_SEP_ARRAY_R
1028 + {
1029 + Border = TRUE;
1030 + Pos = MAP_APPFONT ( 65, 79 );
1031 + Size = MAP_APPFONT ( 10, 12 );
1032 + };
1033 +
1034 + PushButton BTN_FORMULA_SEP_RESET
1035 + {
1036 + Pos = MAP_APPFONT ( 21, 99 );
1037 + Size = MAP_APPFONT ( 40, 14 );
1038 + Text [ en-US ] = "Rese~t";
1039 + };
1040 +};
1041 +
1042 +/**************************************************************************/
1043 +/* */
1044 +/* */
1045 +/* */
1046 +/**************************************************************************/
1047 +
1048 TabPage RID_SCPAGE_USERLISTS
1049 {
1050 HelpId = HID_SCPAGE_USERLISTS ;