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

List:       kde-commits
Subject:    koffice/plugins/pictureshape
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2010-05-09 5:17:32
Message-ID: 20100509051732.90D6EAC8B1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1124400 by zachmann:

o load color transformations in loadStyles, that will avoif an extra
  filling of the style stack, and fix loading for kpresenter as the
  correct styles will be used there too.


 M  +2 -7      PictureShape.cpp  
 M  +2 -2      PictureShape.h  


--- trunk/koffice/plugins/pictureshape/PictureShape.cpp #1124399:1124400
@@ -206,7 +206,6 @@
 
 bool PictureShape::loadOdf(const KoXmlElement &element, KoShapeLoadingContext \
&context)  {
-    loadOdfColorTransformations(element, context);
     loadOdfAttributes(element, context, OdfAllAttributes);
     return loadOdfFrame(element, context);
 }
@@ -241,11 +240,10 @@
     return m_imageCollection;
 }
 
-bool PictureShape::loadOdfColorTransformations(const KoXmlElement& element, \
KoShapeLoadingContext& context) +void PictureShape::loadStyle(const KoXmlElement& \
element, KoShapeLoadingContext& context)  {
+    KoShape::loadStyle(element, context);
     KoStyleStack &styleStack = context.odfLoadingContext().styleStack();
-    styleStack.save();
-    context.odfLoadingContext().fillStyleStack(element, KoXmlNS::draw, "style-name", \
"graphic");  styleStack.setTypeProperties("graphic");
 
     //FIXME: are there other applicable properties?
@@ -261,9 +259,6 @@
             setMode(Watermark);
         }
     }
-
-    styleStack.restore();
-    return true;
 }
 
 PictureShape::PictureMode PictureShape::mode() const
--- trunk/koffice/plugins/pictureshape/PictureShape.h #1124399:1124400
@@ -64,9 +64,9 @@
 protected:
     virtual bool loadOdfFrameElement(const KoXmlElement &element, \
KoShapeLoadingContext &context);  
+    virtual void loadStyle(const KoXmlElement& element, KoShapeLoadingContext& \
context); +
 private:
-    bool loadOdfColorTransformations(const KoXmlElement& element, \
                KoShapeLoadingContext& context);
-
     KoImageCollection *m_imageCollection;
     RenderQueue *m_renderQueue;
     mutable QImage m_printQualityImage;


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