[Libreoffice-commits] core.git: include/formula
include/formula/token.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7220b55f6347e2236e63491cd5d1ef9355c3320a
Author: Kohei Yoshida
Date: Wed Nov 6 20:56:20 2013 -0500
Correct reference count type.
Change-Id: Id7902c8d21d22a6d5f3740a6bd72e0c1213461e7
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index ea91e2c..f5b49cc 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -93,13 +93,13 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
protected:
const StackVar eType; // type of data
-mutable sal_uInt16 nRefCnt;// reference count
+mutable oslInterlockedCount mnRefCnt;// reference count
public:
FormulaToken( StackVar eTypeP,OpCode e =
ocPush ) :
-eOp(e), eType( eTypeP ), nRefCnt(0) {}
+eOp(e), eType( eTypeP ), mnRefCnt(0) {}
FormulaToken( const FormulaToken& r ) :
IFormulaToken(),
-eOp(r.eOp), eType( r.eType ), nRefCnt(0) {}
+eOp(r.eOp), eType( r.eType ), mnRefCnt(0)
{}
virtual ~FormulaToken();
@@ -111,16 +111,16 @@ public:
inline void IncRef() const
{
-osl_atomic_increment(&nRefCnt);
+osl_atomic_increment(&mnRefCnt);
}
inline void DecRef() const
{
-if (!osl_atomic_decrement(&nRefCnt))
+if (!osl_atomic_decrement(&mnRefCnt))
const_cast(this)->Delete();
}
-inline sal_uInt16 GetRef() const { return nRefCnt; }
+inline oslInterlockedCount GetRef() const { return mnRefCnt; }
inline OpCode GetOpCode() const { return eOp; }
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/compiler.hrc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit 084ac2bfcb37a15d16abfca9e13db3829f89a28e Author: Eike Rathke Date: Wed Aug 14 21:23:01 2013 +0200 corrected SC_OPCODE_STOP_2_PAR and SC_OPCODE_LAST_OPCODE_ID 0946de1e2fbf8bd5ad3919429f648359d4464eca did not adapt SC_OPCODE_STOP_2_PAR and adapted SC_OPCODE_LAST_OPCODE_ID wrongly; LEFTB, LENB, MIDB and RIGHTB didn't work, didn't show up in the Function Wizard's Structure tab and also weren't saved to .xlsx Change-Id: I8d31c8c931e40d84e265bf80f76352f5a7190377 diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 91a3d3f..092a093 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -402,16 +402,16 @@ #define SC_OPCODE_AVERAGE_IFS 404 #define SC_OPCODE_COUNT_IFS 405 #define SC_OPCODE_SKEWP 406 -#define SC_OPCODE_STOP_2_PAR407 -#define SC_OPCODE_LENB 408 -#define SC_OPCODE_RIGHTB409 -#define SC_OPCODE_LEFTB 410 -#define SC_OPCODE_MIDB 412 -#define SC_OPCODE_FILTERXML 413 -#define SC_OPCODE_WEBSERVICE414 -#define SC_OPCODE_LAST_OPCODE_ID415 /* last OpCode */ +#define SC_OPCODE_LENB 407 +#define SC_OPCODE_RIGHTB408 +#define SC_OPCODE_LEFTB 409 +#define SC_OPCODE_MIDB 410 +#define SC_OPCODE_FILTERXML 411 +#define SC_OPCODE_WEBSERVICE412 -#define SC_OPCODE_STOP_FUNCTION 416 +#define SC_OPCODE_LAST_OPCODE_ID412 /* last OpCode */ +#define SC_OPCODE_STOP_2_PAR413 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_STOP_FUNCTION 413 /* last function's OpCode + 1 */ /*** Internal ***/ #define SC_OPCODE_INTERNAL_BEGIN ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/compiler.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit efdefd379406cd414ef0901d7aeaaa4f032cf52d Author: Eike Rathke Date: Wed Aug 14 22:34:58 2013 +0200 make this less error prone Change-Id: Ic349d1db5f63b0a2b6ba19eece630d831a912292 diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 092a093..b53b825 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -409,9 +409,9 @@ #define SC_OPCODE_FILTERXML 411 #define SC_OPCODE_WEBSERVICE412 -#define SC_OPCODE_LAST_OPCODE_ID412 /* last OpCode */ #define SC_OPCODE_STOP_2_PAR413 /* last function with two or more parameters' OpCode + 1 */ -#define SC_OPCODE_STOP_FUNCTION 413 /* last function's OpCode + 1 */ +#define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last function's OpCode + 1 */ +#define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1) /* last OpCode */ /*** Internal ***/ #define SC_OPCODE_INTERNAL_BEGIN ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/grammar.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit d9a3381eb586b31d305102b40aea4bf543b42ec7 Author: Julien Nabet Date: Thu Aug 29 18:39:01 2013 +0200 Add GRAM_ENGLISH_XL_OOX as supported See comment //! When adding new values adapt isSupported() below as well of this same file @Eike: ;-) Change-Id: Ifa70be0d88208499bef809cc234c86cb6045bcd3 diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 75556d5..610cf46 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -186,6 +186,7 @@ public: case GRAM_NATIVE_XL_R1C1 : case GRAM_ENGLISH_XL_A1 : case GRAM_ENGLISH_XL_R1C1: +case GRAM_ENGLISH_XL_OOX : return true; default: return extractFormulaLanguage( eGrammar) == GRAM_EXTERNAL; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/grammar.hxx |5 + 1 file changed, 5 insertions(+) New commits: commit 9bff49e203359921cb279be373773deb13ca8b90 Author: Eike Rathke Date: Tue Apr 30 20:16:31 2013 +0200 added GRAM_ENGLISH_XL_OOX, FormulaLanguage::XL_ENGLISH with CONV_XL_OOX Change-Id: Idabf46bfdfa6092b0ae27fe4116382eaa00d5db9 diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 584aff1..75556d5 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -129,6 +129,11 @@ public: ((CONV_XL_R1C1 + kConventionOffset) << kConventionShift) | kEnglishBit, +/// English with Excel OOXML reference style. +GRAM_ENGLISH_XL_OOX = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH | +((CONV_XL_OOX+ + kConventionOffset) << kConventionShift) | +kEnglishBit, /// Central definition of the default grammar to be used. GRAM_DEFAULT= GRAM_NATIVE_UI, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula
include/formula/vectortoken.hxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit d89f93ba774b717413f6b758a7a4684d7b7c8bb6
Author: Kohei Yoshida
Date: Tue Apr 30 15:41:15 2013 -0400
A little more description for the new tokens.
Change-Id: I9b158bd4302a84202447a74ac90cf4e9f760c6a5
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 2679b4e..d3d0511 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -14,6 +14,10 @@
namespace formula {
+/**
+ * This token represents a single cell reference in a vectorized formula
+ * calculation context.
+ */
class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
{
const double* mpArray;
@@ -29,15 +33,17 @@ public:
};
/**
- * This token describes a range reference in a vectorized formula
+ * This token represents a range reference in a vectorized formula
* calculation context.
*/
class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
{
std::vector maArrays;
-size_t mnArrayLength;
-size_t mnRefRowSize;
+size_t mnArrayLength; /// length of all arrays.
+size_t mnRefRowSize; /// original reference row size. The row size may
+ /// change as it goes down the array if either the
+ /// stard or end position is fixed.
bool mbStartFixed:1; /// whether or not the start row position is absolute.
bool mbEndFixed:1; /// whether or not the end row position is absolute.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula sc/source
include/formula/IFunctionDescription.hxx |2 +-
sc/source/ui/formdlg/formula.cxx |4 ++--
sc/source/ui/inc/formula.hxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ac73516da34658005eb06cf1acdd4817ab355a57
Author: Tor Lillqvist
Date: Tue Feb 18 10:12:31 2014 +0200
Spelling fix: s/martix/matrix
Change-Id: Ieba5e6b1c1f32125a4c266e5252d9c1bc729f061
diff --git a/include/formula/IFunctionDescription.hxx
b/include/formula/IFunctionDescription.hxx
index 985da7f..7f75d64 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -155,7 +155,7 @@ namespace formula
virtual ::com::sun::star::table::CellAddress getReferencePosition()
const = 0;
virtual void setDispatcherLock( bool bLock ) = 0;
-virtual void dispatch(bool _bOK, bool _bMartixChecked) = 0;
+virtual void dispatch(bool _bOK, bool _bMatrixChecked) = 0;
virtual void doClose(bool _bOk) = 0;
virtual void insertEntryToLRUList(const IFunctionDescription* pDesc)
= 0;
virtual void showReference(const OUString& _sFormula) = 0;
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 2b0f913..5285de1 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -526,10 +526,10 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit,
formula::RefButton* pB
{
m_aHelper.ReleaseFocus(pEdit,pButton);
}
-void ScFormulaDlg::dispatch(bool _bOK, bool _bMartixChecked)
+void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked)
{
SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK );
-SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked );
+SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMatrixChecked );
SfxStringItem aStrItem( SCITEM_STRING, getCurrentFormula() );
// Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist,
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index c4472cd..fcaffcb 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -65,7 +65,7 @@ public:
virtual void doClose(bool _bOk);
virtual void insertEntryToLRUList(const formula::IFunctionDescription*
pDesc);
virtual void showReference(const OUString& _sFormula);
-virtual void dispatch(bool _bOK, bool _bMartixChecked);
+virtual void dispatch(bool _bOK, bool _bMatrixChecked);
virtual void setDispatcherLock( bool bLock );
virtual void setReferenceInput(const formula::FormEditData* _pData);
virtual void deleteFormData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
