[Libreoffice-commits] core.git: sc/source

Tor Lillqvist tml at iki.fi
Mon May 20 23:09:25 PDT 2013


 sc/source/core/data/columniterator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6c53dff36ebdac7b6a6cf514ab469b2202d6aa48
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 21 09:08:31 2013 +0300

    Bypass for now an OSL_ENSURE that doesn't compile
    
    Change-Id: I8f6a74251cea70e7fd100e1ab233cf0033de4e50

diff --git a/sc/source/core/data/columniterator.cxx b/sc/source/core/data/columniterator.cxx
index 3380c0a..ec4b927 100644
--- a/sc/source/core/data/columniterator.cxx
+++ b/sc/source/core/data/columniterator.cxx
@@ -145,9 +145,11 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, SCROW nEndRow)
 void ScColumnTextWidthIterator::getDataIterators(size_t nOffsetInBlock)
 {
     OSL_ENSURE(miBlockCur != miBlockEnd, "block is at end position");
+#if 0
+    // Does not compile
     OSL_ENSURE(miBlockCur->type == sc::custom_celltextattr_block,
                "wrong block type - unsigned short block expected.");
-
+#endif
     miDataCur = sc::custom_celltextattr_block::begin(*miBlockCur->data);
     miDataEnd = sc::custom_celltextattr_block::end(*miBlockCur->data);
 


More information about the Libreoffice-commits mailing list