[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Tor Lillqvist]

 sc/source/filter/rtf/rtfparse.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 345a5ab62a91822086392c9b2e196a2cc66e9bcc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 22 23:35:50 2011 +0200

    fix for fdo#37429 crash when copy/paste table from writer to calc
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 44d0498..1243138 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -299,7 +299,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
     {
         case RTF_TROWD:			// denotes table row defauls, before RTF_CELLX
         {
-            if ( (pD = &(pDefaultList->back())) != 0 )
+            if ( !pDefaultList->empty() && (pD = &(pDefaultList->back())) != 0 )
                 nLastWidth = pD->nTwips;
             nColCnt = 0;
             pDefaultList->clear();