[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Tue Oct 5 11:49:21 PDT 2010
patches/dev300/apply | 5
patches/dev300/calc-english-func-names-formula.diff | 102 -----
patches/dev300/calc-english-func-names-officecfg.diff | 26 -
patches/dev300/calc-english-func-names-sc.diff | 313 ------------------
4 files changed, 446 deletions(-)
New commits:
commit e21401de059df43d2ad286f1f1ccfee7320cbeec
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Oct 5 14:48:30 2010 -0400
Removed calc-english-func-names-*.diff; moved to git.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7061eed..2443e38 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2649,11 +2649,6 @@ speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
[ CalcFixes ]
-# Support English function names in place of localized ones.
-calc-english-func-names-sc.diff, i#38765, kohei
-calc-english-func-names-formula.diff, i#38765, kohei
-calc-english-func-names-officecfg.diff, i#38765, kohei
-
# Allow export of filtered range selection, and show error when fails.
calc-pdf-export-allow-filtered-range-sc.diff, n#585028, kohei
calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
diff --git a/patches/dev300/calc-english-func-names-formula.diff b/patches/dev300/calc-english-func-names-formula.diff
deleted file mode 100644
index 23a77d6..0000000
--- a/patches/dev300/calc-english-func-names-formula.diff
+++ /dev/null
@@ -1,102 +0,0 @@
----
- formula/inc/formula/FormulaCompiler.hxx | 6 +++-
- formula/source/core/api/FormulaCompiler.cxx | 38 ++++++++++++++++++++++++---
- 2 files changed, 38 insertions(+), 6 deletions(-)
-
-diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx
-index 47fefb3..1ccdf2d 100644
---- formula/inc/formula/FormulaCompiler.hxx
-+++ formula/inc/formula/FormulaCompiler.hxx
-@@ -121,7 +121,8 @@ public:
- mbEnglish = FormulaGrammar::isEnglish( meGrammar);
- }
- virtual ~OpCodeMap();
--
-+
-+ void copyFrom( const OpCodeMap& r );
-
- /// Get the symbol String -> OpCode hash map for finds.
- inline const OpCodeHashMap* getHashMap() const { return mpHashMap; }
-@@ -243,7 +244,8 @@ public:
- inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
-
- static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
--
-+ static void ResetNativeSymbols();
-+ static void SetNativeSymbols( const OpCodeMapPtr& xMap );
- protected:
- virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
- virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
-diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
-index e54ac6a..af1abfe 100644
---- formula/source/core/api/FormulaCompiler.cxx
-+++ formula/source/core/api/FormulaCompiler.cxx
-@@ -642,6 +642,7 @@ const String& FormulaCompiler::GetNativeSymbol( OpCode eOp )
- // -----------------------------------------------------------------------------
- void FormulaCompiler::InitSymbolsNative() const
- {
-+#if 0 // No point in keeping this since you can now do this from the UI.
- if (mxSymbolsNative.get())
- return;
- //! Experimental!
-@@ -656,10 +657,9 @@ void FormulaCompiler::InitSymbolsNative() const
- mxSymbolsNative = mxSymbolsEnglish;
- return;
- }
-- static NonConstOpCodeMapPtr s_sSymbol;
-- if ( !s_sSymbol.get() )
-- lcl_fillNativeSymbols(s_sSymbol);
-- mxSymbolsNative = s_sSymbol;
-+#endif
-+
-+ lcl_fillNativeSymbols(mxSymbolsNative);
- }
- // -----------------------------------------------------------------------------
- void FormulaCompiler::InitSymbolsEnglish() const
-@@ -796,6 +796,22 @@ FormulaCompiler::OpCodeMap::~OpCodeMap()
- delete mpHashMap;
- }
- // -----------------------------------------------------------------------------
-+void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r )
-+{
-+ delete mpHashMap;
-+ mpHashMap = new OpCodeHashMap(mnSymbols);
-+
-+ USHORT n = r.getSymbolCount();
-+ for (USHORT i = 0; i < n; ++i)
-+ {
-+ OpCode eOp = OpCode(i);
-+ const String& rSymbol = r.getSymbol(eOp);
-+ putOpCode(rSymbol, eOp);
-+ }
-+
-+ // TODO: maybe copy the external maps too?
-+}
-+// -----------------------------------------------------------------------------
- sal_Int32 FormulaCompiler::OpCodeMap::getOpCodeUnknown()
- {
- static const sal_Int32 kOpCodeUnknown = -1;
-@@ -1710,6 +1726,20 @@ void FormulaCompiler::UpdateSeparatorsNative(
- xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
- }
-
-+void FormulaCompiler::ResetNativeSymbols()
-+{
-+ NonConstOpCodeMapPtr xSymbolsNative;
-+ lcl_fillNativeSymbols(xSymbolsNative, true);
-+ lcl_fillNativeSymbols(xSymbolsNative);
-+}
-+
-+void FormulaCompiler::SetNativeSymbols( const OpCodeMapPtr& xMap )
-+{
-+ NonConstOpCodeMapPtr xSymbolsNative;
-+ lcl_fillNativeSymbols(xSymbolsNative);
-+ xSymbolsNative->copyFrom(*xMap);
-+}
-+
- // -----------------------------------------------------------------------------
- OpCode FormulaCompiler::NextToken()
- {
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-english-func-names-officecfg.diff b/patches/dev300/calc-english-func-names-officecfg.diff
deleted file mode 100644
index bd804ac..0000000
--- a/patches/dev300/calc-english-func-names-officecfg.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- .../registry/schema/org/openoffice/Office/Calc.xcs | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-index 2db99d2..3a9cd02 100644
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-@@ -1281,6 +1281,14 @@
- </enumeration>
- </constraints>
- </prop>
-+ <prop oor:name="EnglishFunctionName" oor:type="xs:boolean">
-+ <!-- UIHints: Tools - Options Spreadsheet Formula -->
-+ <info>
-+ <author>kyoshida</author>
-+ <desc>Whether to use English function names or localized function names.</desc>
-+ </info>
-+ <value>false</value>
-+ </prop>
- <prop oor:name="SeparatorArg" oor:type="xs:string">
- <!-- UIHints: Tools - Options Spreadsheet Formula -->
- <info>
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-english-func-names-sc.diff b/patches/dev300/calc-english-func-names-sc.diff
deleted file mode 100644
index 57fb48b..0000000
--- a/patches/dev300/calc-english-func-names-sc.diff
+++ /dev/null
@@ -1,313 +0,0 @@
----
- sc/inc/docoptio.hxx | 7 +++++++
- sc/source/core/data/documen3.cxx | 21 +++++++++++++++++++++
- sc/source/core/tool/docoptio.cxx | 25 +++++++++++++++++++++----
- sc/source/ui/inc/optdlg.hrc | 17 +++++++++--------
- sc/source/ui/inc/tpformula.hxx | 1 +
- sc/source/ui/optdlg/tpformula.cxx | 5 ++++-
- sc/source/ui/src/optdlg.src | 23 +++++++++++++++--------
- 7 files changed, 78 insertions(+), 21 deletions(-)
-
-diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx
-index 458c68a..84ec71f 100644
---- sc/inc/docoptio.hxx
-+++ sc/inc/docoptio.hxx
-@@ -53,6 +53,7 @@ class SC_DLLPUBLIC ScDocOptions
- BOOL bDoAutoSpell; // Auto-Spelling
- BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
- BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled
-+ bool bUseEnglishFuncName; // use English function name even if the locale is not English.
- ::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax
-
- ::rtl::OUString aFormulaSepArg;
-@@ -108,6 +109,9 @@ public:
- void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
- ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
-
-+ void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; }
-+ bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; }
-+
- void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; }
- ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
-
-@@ -139,6 +143,7 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt)
- rOpt.bDoAutoSpell = bDoAutoSpell;
- rOpt.bLookUpColRowNames = bLookUpColRowNames;
- rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled;
-+ rOpt.bUseEnglishFuncName = bUseEnglishFuncName;
- rOpt.eFormulaGrammar = eFormulaGrammar;
- rOpt.aFormulaSepArg = aFormulaSepArg;
- rOpt.aFormulaSepArrayRow = aFormulaSepArrayRow;
-@@ -162,6 +167,7 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
- bDoAutoSpell = rCpy.bDoAutoSpell;
- bLookUpColRowNames = rCpy.bLookUpColRowNames;
- bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
-+ bUseEnglishFuncName = rCpy.bUseEnglishFuncName;
- eFormulaGrammar = rCpy.eFormulaGrammar;
- aFormulaSepArg = rCpy.aFormulaSepArg;
- aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow;
-@@ -188,6 +194,7 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const
- && rOpt.bDoAutoSpell == bDoAutoSpell
- && rOpt.bLookUpColRowNames == bLookUpColRowNames
- && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled
-+ && rOpt.bUseEnglishFuncName == bUseEnglishFuncName
- && rOpt.eFormulaGrammar == eFormulaGrammar
- && rOpt.aFormulaSepArg == aFormulaSepArg
- && rOpt.aFormulaSepArrayRow == aFormulaSepArrayRow
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index 44a5b22..15867ed 100644
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
-@@ -1768,12 +1768,33 @@ const ScDocOptions& ScDocument::GetDocOptions() const
- void ScDocument::SetDocOptions( const ScDocOptions& rOpt )
- {
- DBG_ASSERT( pDocOptions, "No DocOptions! :-(" );
-+ bool bUpdateFuncNames = pDocOptions->GetUseEnglishFuncName() != rOpt.GetUseEnglishFuncName();
-+
- *pDocOptions = rOpt;
-
- xPoolHelper->SetFormTableOpt(rOpt);
-
- SetGrammar( rOpt.GetFormulaSyntax() );
-
-+ if (bUpdateFuncNames)
-+ {
-+ // This needs to be called first since it may re-initialize the entire
-+ // opcode map.
-+ if (rOpt.GetUseEnglishFuncName())
-+ {
-+ // switch native symbols to English.
-+ ScCompiler aComp(NULL, ScAddress());
-+ ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH);
-+ ScCompiler::SetNativeSymbols(xMap);
-+ }
-+ else
-+ // re-initialize native symbols with localized function names.
-+ ScCompiler::ResetNativeSymbols();
-+
-+ // Force re-population of function names for the function wizard, function tip etc.
-+ ScGlobal::ResetFunctionList();
-+ }
-+
- // Update the separators.
- ScCompiler::UpdateSeparatorsNative(
- rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow());
-diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
-index b62650f..28ef8da 100644
---- sc/source/core/tool/docoptio.cxx
-+++ sc/source/core/tool/docoptio.cxx
-@@ -103,6 +103,7 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
- bDoAutoSpell( rCpy.bDoAutoSpell ),
- bLookUpColRowNames( rCpy.bLookUpColRowNames ),
- bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
-+ bUseEnglishFuncName( rCpy.bUseEnglishFuncName ),
- eFormulaGrammar( rCpy.eFormulaGrammar ),
- aFormulaSepArg( rCpy.aFormulaSepArg ),
- aFormulaSepArrayRow( rCpy.aFormulaSepArrayRow ),
-@@ -135,6 +136,7 @@ void ScDocOptions::ResetDocOptions()
- bDoAutoSpell = FALSE;
- bLookUpColRowNames = TRUE;
- bFormulaRegexEnabled= TRUE;
-+ bUseEnglishFuncName = false;
- eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE;
-
- ResetFormulaSeparators();
-@@ -274,10 +276,11 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
-
- #define CFGPATH_FORMULA "Office.Calc/Formula"
- #define SCFORMULAOPT_GRAMMAR 0
--#define SCFORMULAOPT_SEP_ARG 1
--#define SCFORMULAOPT_SEP_ARRAY_ROW 2
--#define SCFORMULAOPT_SEP_ARRAY_COL 3
--#define SCFORMULAOPT_COUNT 4
-+#define SCFORMULAOPT_ENGLISH_FUNCNAME 1
-+#define SCFORMULAOPT_SEP_ARG 2
-+#define SCFORMULAOPT_SEP_ARRAY_ROW 3
-+#define SCFORMULAOPT_SEP_ARRAY_COL 4
-+#define SCFORMULAOPT_COUNT 5
-
- #define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
-
-@@ -315,6 +318,7 @@ Sequence<OUString> ScDocCfg::GetFormulaPropertyNames()
- static const char* aPropNames[] =
- {
- "Syntax/Grammar", // SCFORMULAOPT_GRAMMAR
-+ "Syntax/EnglishFunctionName", // SCFORMULAOPT_ENGLISH_FUNCNAME
- "Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG
- "Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW
- "Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL
-@@ -456,6 +460,13 @@ ScDocCfg::ScDocCfg() :
- SetFormulaSyntax(eGram);
- }
- break;
-+ case SCFORMULAOPT_ENGLISH_FUNCNAME:
-+ {
-+ sal_Bool bEnglish;
-+ if (pValues[nProp] >>= bEnglish)
-+ SetUseEnglishFuncName(bEnglish);
-+ }
-+ break;
- case SCFORMULAOPT_SEP_ARG:
- {
- OUString aSep;
-@@ -585,6 +596,12 @@ IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG )
- pValues[nProp] <<= nVal;
- }
- break;
-+ case SCFORMULAOPT_ENGLISH_FUNCNAME:
-+ {
-+ sal_Bool b = GetUseEnglishFuncName();
-+ pValues[nProp] <<= b;
-+ }
-+ break;
- case SCFORMULAOPT_SEP_ARG:
- pValues[nProp] <<= GetFormulaSepArg();
- break;
-diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
-index 7860ad3..821e71e 100644
---- sc/source/ui/inc/optdlg.hrc
-+++ sc/source/ui/inc/optdlg.hrc
-@@ -196,11 +196,12 @@
- #define FL_FORMULA_OPTIONS 80
- #define FT_FORMULA_SYNTAX 81
- #define LB_FORMULA_SYNTAX 82
--#define FL_FORMULA_SEPS 83
--#define FT_FORMULA_SEP_ARG 84
--#define ED_FORMULA_SEP_ARG 85
--#define FT_FORMULA_SEP_ARRAY_R 86
--#define ED_FORMULA_SEP_ARRAY_R 87
--#define FT_FORMULA_SEP_ARRAY_C 88
--#define ED_FORMULA_SEP_ARRAY_C 89
--#define BTN_FORMULA_SEP_RESET 90
-+#define CB_ENGLISH_FUNC_NAME 83
-+#define FL_FORMULA_SEPS 84
-+#define FT_FORMULA_SEP_ARG 85
-+#define ED_FORMULA_SEP_ARG 86
-+#define FT_FORMULA_SEP_ARRAY_R 87
-+#define ED_FORMULA_SEP_ARRAY_R 88
-+#define FT_FORMULA_SEP_ARRAY_C 89
-+#define ED_FORMULA_SEP_ARRAY_C 90
-+#define BTN_FORMULA_SEP_RESET 91
-diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx
-index ff9d329..645575a 100644
---- sc/source/ui/inc/tpformula.hxx
-+++ sc/source/ui/inc/tpformula.hxx
-@@ -72,6 +72,7 @@ private:
- FixedLine maFlFormulaOpt;
- FixedText maFtFormulaSyntax;
- ListBox maLbFormulaSyntax;
-+ CheckBox maCbEnglishFuncName;
-
- FixedLine maFlFormulaSeps;
- FixedText maFtSepFuncArg;
-diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx
-index db76fee..1852896 100644
---- sc/source/ui/optdlg/tpformula.cxx
-+++ sc/source/ui/optdlg/tpformula.cxx
-@@ -59,6 +59,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA
- maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)),
- maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
- maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
-+ maCbEnglishFuncName(this, ScResId(CB_ENGLISH_FUNC_NAME)),
- maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
- maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
- maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
-@@ -234,7 +235,7 @@ BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
- }
-
- mpNewOptions->SetFormulaSyntax(eGram);
--
-+ mpNewOptions->SetUseEnglishFuncName(maCbEnglishFuncName.IsChecked());
- mpNewOptions->SetFormulaSepArg(maEdSepFuncArg.GetText());
- mpNewOptions->SetFormulaSepArrayCol(maEdSepArrayCol.GetText());
- mpNewOptions->SetFormulaSepArrayRow(maEdSepArrayRow.GetText());
-@@ -266,6 +267,8 @@ void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/)
- maLbFormulaSyntax.SelectEntryPos(0);
- }
-
-+ maCbEnglishFuncName.Check(mpNewOptions->GetUseEnglishFuncName());
-+
- OUString aSep = mpNewOptions->GetFormulaSepArg();
- OUString aSepArrayRow = mpNewOptions->GetFormulaSepArrayRow();
- OUString aSepArrayCol = mpNewOptions->GetFormulaSepArrayCol();
-diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
-index c961cda..9e6b8f0 100644
---- sc/source/ui/src/optdlg.src
-+++ sc/source/ui/src/optdlg.src
-@@ -215,16 +215,23 @@ TabPage RID_SCPAGE_FORMULA
- };
- };
-
-+ CheckBox CB_ENGLISH_FUNC_NAME
-+ {
-+ Pos = MAP_APPFONT ( 12, 31 ) ;
-+ Size = MAP_APPFONT ( 120, 8 ) ;
-+ Text [ en-US ] = "Use English function names" ;
-+ };
-+
- FixedLine FL_FORMULA_SEPS
- {
-- Pos = MAP_APPFONT ( 6 , 32 ) ;
-+ Pos = MAP_APPFONT ( 6 , 46 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Separators";
- };
-
- FixedText FT_FORMULA_SEP_ARG
- {
-- Pos = MAP_APPFONT ( 21, 45 );
-+ Pos = MAP_APPFONT ( 21, 59 );
- Size = MAP_APPFONT ( 40, 8 );
- Text [ en-US ] = "~Function";
- };
-@@ -232,13 +239,13 @@ TabPage RID_SCPAGE_FORMULA
- Edit ED_FORMULA_SEP_ARG
- {
- Border = TRUE;
-- Pos = MAP_APPFONT ( 65, 43 );
-+ Pos = MAP_APPFONT ( 65, 57 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- FixedText FT_FORMULA_SEP_ARRAY_C
- {
-- Pos = MAP_APPFONT ( 21, 63 );
-+ Pos = MAP_APPFONT ( 21, 77 );
- Size = MAP_APPFONT ( 40, 8 );
- Text [ en-US ] = "Array co~lumn";
- };
-@@ -246,13 +253,13 @@ TabPage RID_SCPAGE_FORMULA
- Edit ED_FORMULA_SEP_ARRAY_C
- {
- Border = TRUE;
-- Pos = MAP_APPFONT ( 65, 61 );
-+ Pos = MAP_APPFONT ( 65, 75 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- FixedText FT_FORMULA_SEP_ARRAY_R
- {
-- Pos = MAP_APPFONT ( 21, 81 );
-+ Pos = MAP_APPFONT ( 21, 95 );
- Size = MAP_APPFONT ( 40, 8 );
- Text [ en-US ] = "Array ~row";
- };
-@@ -260,13 +267,13 @@ TabPage RID_SCPAGE_FORMULA
- Edit ED_FORMULA_SEP_ARRAY_R
- {
- Border = TRUE;
-- Pos = MAP_APPFONT ( 65, 79 );
-+ Pos = MAP_APPFONT ( 65, 93 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- PushButton BTN_FORMULA_SEP_RESET
- {
-- Pos = MAP_APPFONT ( 21, 99 );
-+ Pos = MAP_APPFONT ( 21, 113 );
- Size = MAP_APPFONT ( 40, 14 );
- Text [ en-US ] = "Rese~t";
- };
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list