summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-06-18 10:07:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-06-18 13:06:12 +0100
commit7377557f277b19c4953198c17b591fd964ac7c40 (patch)
tree205ee08ac0651082379c1bced5ada7105e27029a /include
parentLet WINDOWS_SDK_WILANGID override the location of WiLangId.vbs (diff)
downloadcore-7377557f277b19c4953198c17b591fd964ac7c40.tar.gz
core-7377557f277b19c4953198c17b591fd964ac7c40.zip
Resolves: #i122120# Changed UI preview creators...
to no longer need SdrModel/SdrObject (cherry picked from commit 0c353433ad94786a937fa9da01d6e7382e3da942) corrected unwanted change (cherry picked from commit 8a10735b8ee3926a592d6919f4dbb823771bed9f) Conflicts: vcl/inc/vcl/outdev.hxx 7c096015d974382e6874a874370ee72a61f02e6a Change-Id: Ib2afe135566eba2e99cc8c4a653de3df0fa7f0cd
Diffstat (limited to 'include')
-rw-r--r--include/drawinglayer/primitive2d/polygonprimitive2d.hxx7
-rw-r--r--include/svx/xtable.hxx61
-rw-r--r--include/vcl/outdev.hxx7
-rw-r--r--include/vcl/settings.hxx6
4 files changed, 31 insertions, 50 deletions
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 2985c0e449e5..bf6d83f19a10 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -287,6 +287,13 @@ namespace drawinglayer
const attribute::LineStartEndAttribute& rStart,
const attribute::LineStartEndAttribute& rEnd);
+ /// constructor without stroking
+ PolygonStrokeArrowPrimitive2D(
+ const basegfx::B2DPolygon& rPolygon,
+ const attribute::LineAttribute& rLineAttribute,
+ const attribute::LineStartEndAttribute& rStart,
+ const attribute::LineStartEndAttribute& rEnd);
+
/// data read access
const attribute::LineStartEndAttribute& getStart() const { return maStart; }
const attribute::LineStartEndAttribute& getEnd() const { return maEnd; }
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 9ac5b2e75287..6f5a23aa388e 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -43,7 +43,6 @@
class Color;
class Bitmap;
class VirtualDevice;
-class XOutdevItemPool;
// Standard-Vergleichsstring
extern sal_Unicode pszStandard[]; // "standard"
@@ -212,15 +211,13 @@ protected:
XPropertyListType meType;
String maName; // not persistent
String maPath;
- XOutdevItemPool* mpXPool;
XPropertyEntryList_impl maList;
bool mbListDirty;
bool mbEmbedInDocument;
- XPropertyList( XPropertyListType t, const String& rPath,
- XOutdevItemPool* pXPool = NULL );
+ XPropertyList( XPropertyListType t, const String& rPath );
virtual Bitmap CreateBitmapForUI( long nIndex ) = 0;
@@ -268,12 +265,10 @@ public:
// Factory method for sub-classes
static XPropertyListRef CreatePropertyList( XPropertyListType t,
- const String& rPath,
- XOutdevItemPool* pXPool = NULL );
+ const String& rPath );
// as above but initializes name as expected
static XPropertyListRef CreatePropertyListFromURL( XPropertyListType t,
- const OUString & rUrl,
- XOutdevItemPool* pXPool = NULL );
+ const OUString & rUrl );
// helper accessors
inline XDashListRef AsDashList();
@@ -294,9 +289,8 @@ protected:
virtual Bitmap CreateBitmapForUI( long nIndex );
public:
- explicit XColorList( const String& rPath,
- XOutdevItemPool* pXInPool = NULL ) :
- XPropertyList( XCOLOR_LIST, rPath, pXInPool ) {}
+ explicit XColorList( const String& rPath )
+ : XPropertyList( XCOLOR_LIST, rPath ) {}
using XPropertyList::Replace;
using XPropertyList::Remove;
@@ -319,20 +313,11 @@ class impXLineEndList;
class SVX_DLLPUBLIC XLineEndList : public XPropertyList
{
-private:
- impXLineEndList* mpData;
-
- void impCreate();
- void impDestroy();
-
protected:
virtual Bitmap CreateBitmapForUI(long nIndex);
public:
- explicit XLineEndList(
- const String& rPath,
- XOutdevItemPool* pXPool = 0
- );
+ explicit XLineEndList( const String& rPath );
virtual ~XLineEndList();
using XPropertyList::Remove;
@@ -352,23 +337,16 @@ class impXDashList;
class SVX_DLLPUBLIC XDashList : public XPropertyList
{
private:
- impXDashList* mpData;
Bitmap maBitmapSolidLine;
String maStringSolidLine;
String maStringNoLine;
- void impCreate();
- void impDestroy();
-
protected:
Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
virtual Bitmap CreateBitmapForUI(long nIndex);
public:
- explicit XDashList(
- const String& rPath,
- XOutdevItemPool* pXPool = 0
- );
+ explicit XDashList(const String& rPath);
virtual ~XDashList();
using XPropertyList::Replace;
@@ -399,18 +377,11 @@ class impXHatchList;
class SVX_DLLPUBLIC XHatchList : public XPropertyList
{
-private:
- impXHatchList* mpData;
-
- void impCreate();
- void impDestroy();
-
protected:
virtual Bitmap CreateBitmapForUI(long nIndex);
public:
- explicit XHatchList( const String& rPath,
- XOutdevItemPool* pXPool = 0 );
+ explicit XHatchList( const String& rPath );
virtual ~XHatchList();
using XPropertyList::Replace;
@@ -431,20 +402,11 @@ class impXGradientList;
class SVX_DLLPUBLIC XGradientList : public XPropertyList
{
-private:
- impXGradientList* mpData;
-
- void impCreate();
- void impDestroy();
-
protected:
virtual Bitmap CreateBitmapForUI(long nIndex);
public:
- explicit XGradientList(
- const String& rPath,
- XOutdevItemPool* pXPool = 0
- );
+ explicit XGradientList( const String& rPath );
virtual ~XGradientList();
using XPropertyList::Replace;
@@ -468,9 +430,8 @@ protected:
virtual Bitmap CreateBitmapForUI( long nIndex );
public:
- explicit XBitmapList( const String& rPath,
- XOutdevItemPool* pXInPool = NULL )
- : XPropertyList( XBITMAP_LIST, rPath, pXInPool ) {}
+ explicit XBitmapList( const String& rPath )
+ : XPropertyList( XBITMAP_LIST, rPath ) {}
using XPropertyList::Replace;
using XPropertyList::Remove;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 306c9d455304..5edf88a966ea 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1049,6 +1049,13 @@ public:
static basegfx::B2DPolygon LogicToLogic( const basegfx::B2DPolygon& rPoly,
const MapMode& rMapModeSource,
const MapMode& rMapModeDest );
+ static basegfx::B2DPolyPolygon LogicToLogic( const basegfx::B2DPolyPolygon& rPolyPoly,
+ const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest );
+
+ // create a mapping transformation from rMapModeSource to rMapModeDest (the above methods
+ // for B2DPoly/Polygons use this internally anyways to transform the B2DPolygon)
+ static basegfx::B2DHomMatrix LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest);
Size GetOutputSizePixel() const
{ return Size( mnOutWidth, mnOutHeight ); }
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 2c4d6ba71beb..10f23d44713c 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -360,6 +360,7 @@ private:
Size maListBoxPreviewDefaultLogicSize;
Size maListBoxPreviewDefaultPixelSize;
sal_uInt16 mnListBoxPreviewDefaultLineWidth;
+ sal_Bool mbUIPreviewUsesCheckeredBackground;
OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes.
@@ -932,6 +933,11 @@ public:
void SetListBoxPreviewDefaultLineWidth(sal_uInt16 nWidth) { CopyData(); mpData->mnListBoxPreviewDefaultLineWidth = nWidth; }
sal_uInt16 GetListBoxPreviewDefaultLineWidth() const { return mpData->mnListBoxPreviewDefaultLineWidth; }
+ // defines if previews which containn potentially transparent objects (e.g. the dash/line/LineStartEnd previews and others)
+ // use the default transparent visualization background (checkered background) as it has got standard in graphic programs nowadays
+ void SetUIPreviewUsesCheckeredBackground(bool bNew) { CopyData(); mpData->mbUIPreviewUsesCheckeredBackground = bNew; }
+ bool GetUIPreviewUsesCheckeredBackground() const { return mpData->mbUIPreviewUsesCheckeredBackground; }
+
void SetStandardStyles();
const StyleSettings& operator =( const StyleSettings& rSet );