#i39532# bullet extensions

5 files changed, 83 insertions, 11 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index c56ddd68b67a..1bbbafa2cfa3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: drawinglayer_primitivetypes2d.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: aw $ $Date: 2007-09-26 11:36:28 $
+ *  last change: $Author: aw $ $Date: 2007-09-27 15:59:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -91,6 +91,7 @@
 #define PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D               (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 42)
 #define PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D                (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 43)
 #define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D                (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D       (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 45)
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 459ad26a5e90..0e162b4df2ce 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: texthierarchyprimitive2d.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2007-09-26 11:36:28 $
+ *  last change: $Author: aw $ $Date: 2007-09-27 15:59:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -73,6 +73,25 @@ namespace drawinglayer
     namespace primitive2d
     {
         // see TextHierarchyLinePrimitive2D comment
+        class TextHierarchyBulletPrimitive2D : public GroupPrimitive2D
+        {
+        private:
+        public:
+            TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren);
+
+            // provide unique ID
+            DeclPrimitrive2DIDBlock()
+        };
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        // see TextHierarchyLinePrimitive2D comment
         class TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D
         {
         private:
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index f712070afb6d..291062593913 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: texthierarchyprimitive2d.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2007-09-26 11:36:36 $
+ *  last change: $Author: aw $ $Date: 2007-09-27 15:59:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -85,6 +85,23 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
+        TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren)
+        :   GroupPrimitive2D(rChildren)
+        {
+        }
+
+        // provide unique ID
+        ImplPrimitrive2DIDBlock(TextHierarchyBulletPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D)
+
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
         TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(const Primitive2DSequence& rChildren)
         :   GroupPrimitive2D(rChildren)
         {
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
index 4a1dede1e183..dfc092bbc2c2 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: vclhelperbitmaptransform.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2007-03-06 12:34:16 $
+ *  last change: $Author: aw $ $Date: 2007-09-27 15:59:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -353,7 +353,29 @@ namespace drawinglayer
                     if(rSource.IsTransparent())
                     {
                         // clear bitmap with dest color
-                        aChangedBitmap.Erase(Color(rModifier.getBColor()));
+                        if(aChangedBitmap.GetBitCount() <= 8)
+                        {
+                            // do NOT use erase; for e.g. 8bit Bitmaps, the nearest color to the given
+                            // erase color is determined and used -> this may be different from what is
+                            // wanted here. Better create a new bitmap with the needed color explicitely
+                            BitmapReadAccess* pReadAccess = aChangedBitmap.AcquireReadAccess();
+                            OSL_ENSURE(pReadAccess, "Got no Bitmap ReadAccess ?!?");
+
+                            if(pReadAccess)
+                            {
+                                BitmapPalette aNewPalette(pReadAccess->GetPalette());
+                                aNewPalette[0] = BitmapColor(Color(rModifier.getBColor()));
+                                aChangedBitmap = Bitmap(
+                                    aChangedBitmap.GetSizePixel(),
+                                    aChangedBitmap.GetBitCount(),
+                                    &aNewPalette);
+                                delete pReadAccess;
+                            }
+                        }
+                        else
+                        {
+                            aChangedBitmap.Erase(Color(rModifier.getBColor()));
+                        }
                     }
                     else
                     {
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 3302f45b223d..b99c3670354c 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: vclmetafileprocessor2d.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: aw $ $Date: 2007-09-26 11:36:36 $
+ *  last change: $Author: aw $ $Date: 2007-09-27 15:59:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -835,6 +835,19 @@ namespace drawinglayer
 
                     break;
                 }
+                case PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D :
+                {
+                    // in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The
+                    // "XTEXT_EOC" is used, use here, too.
+                    const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate);
+                    static const ByteString aCommentString("XTEXT_EOC");
+
+                    // process recursively and add MetaFile comment
+                    process(rBulletPrimitive.get2DDecomposition(getViewInformation2D()));
+                    mrMetaFile.AddAction(new MetaCommentAction(aCommentString));
+
+                    break;
+                }
                 case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D :
                 {
                     const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate);