diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:12 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:12 +0200 |
commit | 912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch) | |
tree | 9786710241c767f0f6917200c9318978b0d787dd /sc/inc/compiler.hxx | |
parent | bc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:03 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 3152922a95e18814e32bcf8bc29c872077d05a65
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed May 4 09:06:08 2011 -0400
lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly.
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
sc/source/core/tool/interpr1.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Mon Mar 21 16:01:47 2011 -0400
Fix seg faults on sheet deletion.
Sometimes a simple sheet removal causes segfault in certain types of
documents. Not always reproducible, but this fix is certainly safer.
(n#680272)
Signed-off-by: Noel Power <nopower@novell.com>
sc/source/ui/docshell/docfunc.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit e54c3699db11dc1bcc7bd7fa069c9c4124715839
Author: Tibby Lickle <tibbylickle@googlemail.com>
Date: Thu Mar 10 19:08:18 2011 +0000
Disabled auto-complete in Calc filter dialog - fix for bug 34898.
A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden.
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
sc/source/ui/dbgui/filtdlg.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes:
split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/inc/compiler.hxx')
-rw-r--r-- | sc/inc/compiler.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 1229042f5ff0..c492f2ff01e3 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -416,7 +416,7 @@ public: const ScAddress& GetPos() const { return aPos; } void MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow ); - static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, + static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow ); BOOL UpdateNameReference( UpdateRefMode eUpdateRefMode, @@ -441,7 +441,7 @@ public: BOOL HasModifiedRange(); - /** If the character is allowed as first character in sheet names or + /** If the character is allowed as first character in sheet names or references, includes '$' and '?'. */ static inline BOOL IsCharWordChar( String const & rStr, xub_StrLen nPos, @@ -459,7 +459,7 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed in sheet names, thus may be part of a + /** If the character is allowed in sheet names, thus may be part of a reference, includes '$' and '?' and such. */ static inline BOOL IsWordChar( String const & rStr, xub_StrLen nPos, @@ -477,11 +477,11 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... - bits) for all known address conventions. If more than one bit is given - in nFlags, all bits must match. If bTestLetterNumeric is FALSE and + /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... + bits) for all known address conventions. If more than one bit is given + in nFlags, all bits must match. If bTestLetterNumeric is FALSE and char>=128, no LetterNumeric test is done and FALSE is returned. */ - static inline bool IsCharFlagAllConventions( String const & rStr, + static inline bool IsCharFlagAllConventions( String const & rStr, xub_StrLen nPos, ULONG nFlags, bool bTestLetterNumeric = true ) @@ -493,7 +493,7 @@ public: for ( int nConv = formula::FormulaGrammar::CONV_UNSPECIFIED; ++nConv < formula::FormulaGrammar::CONV_LAST; ) { - if (pConventions[nConv] && + if (pConventions[nConv] && ((pConventions[nConv]->getCharTableFlags(c, cLast) & nFlags) != nFlags)) return false; // convention not known => assume valid @@ -525,7 +525,7 @@ private: virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name + virtual void LocalizeString( String& rName ); // modify rName - input: exact name virtual BOOL IsImportingXML() const; /// Access the CharTable flags |