mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: #i121194# adapt template dialog code

Browse Source 
we probably should remove the Bitmaps and use Graphics
exlusively, but for now do a simple brute force conversion

Change-Id: I0cdcb7d86f9304fd09f7e2c6aa7acdcec3785ae5
This commit is contained in:
Caolán McNamara
2013-06-11 17:27:41 +01:00
parent 37aa7d81aa
commit 04c2e4f583
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sfx2/source/control/templatecontaineritem.cxx
View File

@@ -12,8 +12,8 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <drawinglayer/primitive2d/fillbitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
@@ -21,6 +21,7 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <sfx2/templateviewitem.hxx> #include <sfx2/templateviewitem.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/graph.hxx>
using namespace basegfx; using namespace basegfx;
using namespace basegfx::tools; using namespace basegfx::tools;
@@ -138,11 +139,12 @@ void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D *p
aSeq[nCount++] = Primitive2DReference( new PolyPolygonColorPrimitive2D( aSeq[nCount++] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor())); B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor()));
aSeq[nCount++] = Primitive2DReference( new FillBitmapPrimitive2D( aSeq[nCount++] = Primitive2DReference( new FillGraphicPrimitive2D(
createScaleTranslateB2DHomMatrix(1.0,1.0,fPosX,fPosY), createScaleTranslateB2DHomMatrix(1.0,1.0,fPosX,fPosY),
FillBitmapAttribute(*pImage, FillGraphicAttribute(Graphic(*pImage),
B2DPoint(0.0,0.0), B2DRange(
B2DVector(aImageSize.Width(),aImageSize.Height()), B2DPoint(0.0,0.0),
B2DPoint(aImageSize.Width(),aImageSize.Height())),
false) false)
)); ));

14
sfx2/source/control/templateviewitem.cxx
View File

@@ -11,14 +11,15 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <drawinglayer/primitive2d/fillbitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/graph.hxx>
#define SUBTITLE_SCALE_FACTOR 0.85 #define SUBTITLE_SCALE_FACTOR 0.85
@@ -96,11 +97,12 @@ void TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
aSeq[1] = Primitive2DReference( new PolyPolygonColorPrimitive2D( aSeq[1] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor())); B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor()));
aSeq[2] = Primitive2DReference( new FillBitmapPrimitive2D( aSeq[2] = Primitive2DReference( new FillGraphicPrimitive2D(
createTranslateB2DHomMatrix(maPrev1Pos.X(),maPrev1Pos.Y()), createTranslateB2DHomMatrix(maPrev1Pos.X(),maPrev1Pos.Y()),
FillBitmapAttribute(maPreview1, FillGraphicAttribute(Graphic(maPreview1),
B2DPoint(0,0), B2DRange(
B2DVector(aImageSize.Width(),aImageSize.Height()), B2DPoint(0,0),
B2DPoint(aImageSize.Width(),aImageSize.Height())),
false) false)
)); ));

4
sfx2/source/control/thumbnailview.cxx
View File

@@ -20,9 +20,9 @@
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dsize.hxx>
#include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2dvector.hxx>
#include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <drawinglayer/attribute/fontattribute.hxx> #include <drawinglayer/attribute/fontattribute.hxx>
#include <drawinglayer/primitive2d/fillbitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx>

14
sfx2/source/control/thumbnailviewitem.cxx
View File

@@ -26,14 +26,15 @@
#include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2drectangle.hxx>
#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dsize.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <drawinglayer/primitive2d/fillbitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/texteng.hxx> #include <vcl/texteng.hxx>
@@ -258,11 +259,12 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
Point aPos = maPrev1Pos; Point aPos = maPrev1Pos;
Size aImageSize = maPreview1.GetSizePixel(); Size aImageSize = maPreview1.GetSizePixel();
aSeq[nPrimitive++] = Primitive2DReference( new FillBitmapPrimitive2D( aSeq[nPrimitive++] = Primitive2DReference( new FillGraphicPrimitive2D(
createTranslateB2DHomMatrix(aPos.X(),aPos.Y()), createTranslateB2DHomMatrix(aPos.X(),aPos.Y()),
FillBitmapAttribute(maPreview1, FillGraphicAttribute(Graphic(maPreview1),
B2DPoint(0,0), B2DRange(
B2DVector(aImageSize.Width(),aImageSize.Height()), B2DPoint(0,0),
B2DPoint(aImageSize.Width(),aImageSize.Height())),
false) false)
)); ));