[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Thu Nov 25 12:05:37 PST 2010


 patches/dev300/fields-table-formula.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87be615e7da9a05412e221b6f32205d7d1ca7f6e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 25 21:04:56 2010 +0100

    fix fields-table-formula.diff to apply after the OSL_ENSURE change

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index b00fdab..e809488 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -993,7 +993,7 @@ index c3beb63..1278fc7 100644
 +                                    sal_Bool bTextValue,
 +                                    sal_Bool bWWFormula )
  {
-     ASSERT( nCurCol < GetColumnCount(),
+     OSL_ENSURE( nCurCol < GetColumnCount(),
              "SwXMLTableContext::InsertCell: row is full" );
 @@ -1686,7 +1700,7 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
              GetCell( nRowsReq-j, nColsReq-i )


More information about the Libreoffice-commits mailing list