sc/inc/token.hxx | 2 +-
sc/source/core/tool/compiler.cxx | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6e690a62e419b2de364bac09d30786b66a98f2f3
Author: Eike Rathke <er...@redhat.com>
Date: Thu Mar 12 21:14:16 2015 +0100
TableRef: use existing ALL instead of yet another bit
Change-Id: I7f8cdba40d1d455927557c31867b822afb9dff7e
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 662c17c..6f6cd4b 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -224,7 +224,7 @@ public:
HEADERS_DATA = HEADERS | DATA,
DATA_TOTALS = DATA | TOTALS,
HEADERS_DATA_TOTALS = HEADERS | DATA | TOTALS,
- ALL_COLUMN = HEADERS_DATA_TOTALS | 32 // semantically the same, but
just a [#All] item
+ ALL_COLUMN = HEADERS_DATA_TOTALS | ALL // semantically the same, but
just a [#All] item
};
ScTableRefToken( sal_uInt16 nIndex, Item eItem );
commit e36c121992819853138bbce13141fcc30e6c643c
Author: Eike Rathke <er...@redhat.com>
Date: Thu Mar 12 20:34:53 2015 +0100
TableRef: parse away an optional #All in entire table
Change-Id: Ibe7c67b608ab97c83fcac6adf95d67e00a74fd72
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index fb999b4..fd0bf45 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4745,7 +4745,8 @@ bool ScCompiler::HandleTableRef()
// Optional [] (or [#All]) may follow.
if ((bGotToken = GetToken()) && mpToken->GetOpCode() ==
ocTableRefOpen)
{
- if ((bGotToken = GetToken()) && mpToken->GetOpCode() ==
ocTableRefClose)
+ bool bAll = ((bGotToken = GetToken()) && mpToken->GetOpCode()
== ocTableRefItemAll);
+ if (bGotToken && (!bAll || (bGotToken = GetToken())) &&
mpToken->GetOpCode() == ocTableRefClose)
bGotToken = false; // get next token below
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
