[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Re: [PATCH] Fix KPresenter pasting of images between KPresenter
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2007-03-27 19:29:44
Message-ID: 200703272129.44669.aacid () kde ! org
[Download RAW message or body]

A Dimarts 27 Mar=C3=A7 2007, Thorsten Zachmann va escriure:
> On Monday 26 March 2007, Albert Astals Cid wrote:
> > *** I'M NOT ON THE LIST PLEASE CC ME ***
> >
> > Hi, on 1.6 branch, KPresenter is not able of pasting images between
> > different KPresenter instances running.
> >
> > This patch fixes it for me.
> >
> > Comments?
>
> The patch looks good.
>
> > Can i commit?
>
> Have you also tested loading and saving of documents with pictures? If all
> works fine please commit.

Ok, second try, it seems to work with all cases now.

Albert

>
> Thorsten



["PATCH" (text/x-diff)]

Index: KPrPixmapObject.cpp
===================================================================
--- KPrPixmapObject.cpp	(revision 646000)
+++ KPrPixmapObject.cpp	(working copy)
@@ -249,8 +249,10 @@
 
 void KPrPixmapObject::reload( void )
 {
-    // ### FIXME: this seems wrong, KoPictureCollection will never reload it (or \
perhaps it is the function name that is wrong)  setPicture( image.getKey() );
+    if (image.isNull()) {
+        image = imageCollection->loadPicture( image.getKey().filename() );
+    }
 }
 
 QDomDocumentFragment KPrPixmapObject::save( QDomDocument& doc, double offset )



_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]