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

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Jun 3 10:55:26 PDT 2011


 sw/source/core/graphic/ndgrf.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 349cdd39cb23c99ecc4a299729dbc8ab0ac89bd8
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jun 3 14:35:38 2011 +0200

    Fix one of the crashes in wizards - fdo#36306
    
    This fixes the following problem:
    
    - open "File/Wizards/Letter"
    - select "Formal Personal letter" radio button
    - press "Finish" button
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 6bcbec2..0a11a93 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -806,8 +806,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
         {
             xub_StrLen nExtPos = _aStrmName.Search( '.' );
             String aExtStr = _aStrmName.Copy( nExtPos );
-            Graphic aGraphic( GetGrfObj().GetGraphic() );
-            if ( aGraphic.GetType() != GRAPHIC_NONE )
+            if ( GetGrfObj().GetType() != GRAPHIC_NONE )
             {
                 _aStrmName = String( GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US );
                 _aStrmName += aExtStr;


More information about the Libreoffice-commits mailing list