[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sc/source
sc/source/filter/excel/xestream.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce2c62175858a6dd1fc9c5e62904442009177833
Author: Eike Rathke
Date: Wed Apr 2 16:54:17 2014 +0200
resolved fdo#76949 correct grammar is GRAM_OOXML
Regression introduced with ca8ca8c28742879220f3ff88ae0d71c8d69b11cd that
used GRAM_ENGLISH_XL_OOX instead, which is English UI function names
with OOXML reference syntax.
Change-Id: If6b73e85a45e57f6ef281d1edf8e34dec7cb9bb8
(cherry picked from commit 31e4419ac7581aa7864905bcd4ce42e14df6c9bb)
Reviewed-on: https://gerrit.libreoffice.org/8818
Reviewed-by: Kohei Yoshida
Reviewed-by: Markus Mohrhard
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 3e9935d..035a827 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -824,7 +824,7 @@ OUString XclXmlUtils::ToOUString(
ScDocument& rDocument, const ScAddress& rAddress, const ScTokenArray*
pTokenArray )
{
ScCompiler aCompiler( &rDocument, rAddress,
const_cast(*pTokenArray));
-aCompiler.SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_OOX);
+aCompiler.SetGrammar(FormulaGrammar::GRAM_OOXML);
OUStringBuffer aBuffer( pTokenArray->GetLen() * 5 );
aCompiler.CreateStringFromTokenArray( aBuffer );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sc/source
sc/source/core/data/dociter.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit b4bba09ba98cfa40d559f98aaf8ae4730c6f075a
Author: Kohei Yoshida
Date: Thu Mar 13 10:22:25 2014 -0400
fdo#75642: Check the high position block correctly.
Change-Id: I25deabf69e78c6e0354e8a528ab88891a30f9aec
(cherry picked from commit c078d5fef98ba77751b7a9593691d88dfc1c9ba1)
Reviewed-on: https://gerrit.libreoffice.org/8573
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
Reviewed-on: https://gerrit.libreoffice.org/8576
Reviewed-by: Norbert Thiebaud
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 5758c52..1461472 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1554,7 +1554,9 @@ public:
// Move to the last position of the previous block.
decBlock(aHiPos);
-if (aHiPos.first == mrCells.begin())
+// Check the row postion of the end of the previous block, and
make sure it's valid.
+SCROW nBlockEndRow = aHiPos.first->position + aHiPos.first->size -
1;
+if (nBlockEndRow < nStartRow)
{
mbValid = false;
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sc/source
sc/source/filter/inc/sheetdatacontext.hxx |4 ++--
sc/source/filter/oox/sheetdatacontext.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 13686e068a057feb395308dfdce6df6717e1e4e6
Author: Kohei Yoshida
Date: Thu Mar 13 18:01:21 2014 -0400
fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.
Change-Id: I098d300532bef164bef0d40ebf62a6848bc19cb8
(cherry picked from commit ff56553e34dfed01b9226ce7a516dbeb6da32124)
Reviewed-on: https://gerrit.libreoffice.org/8577
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
Reviewed-on: https://gerrit.libreoffice.org/8578
Reviewed-by: Norbert Thiebaud
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index 3f3e377..880c60e 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -129,8 +129,8 @@ private:
boolmbHasFormula; /// True = current cell has
formula data (OOXML only).
boolmbValidRange; /// True = maFmlaData.maFormulaRef
is valid (OOXML only).
-sal_Int32 mnRow;
-sal_Int32 mnCol;
+sal_Int32 mnRow; /// row index (0-based)
+sal_Int32 mnCol; /// column index (0-based)
};
//
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index 4bd841d..bbda959 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -279,11 +279,11 @@ ContextHandlerRef
SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
void SheetDataContext::importRow( const AttributeList& rAttribs )
{
RowModel aModel;
-sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
+sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 ); // 1-based row index
if(nRow != -1)
{
aModel.mnRow = nRow;
-mnRow = nRow;
+mnRow = nRow-1; // to 0-based row index.
}
else
aModel.mnRow = ++mnRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
