include/svx/galleryitem.hxx | 12
include/svx/unoshprp.hxx | 460 ++++++++--------
svx/inc/bitmaps.hlst | 342 +++++------
svx/inc/helpids.h | 70 +-
svx/inc/strings.hxx | 20
svx/source/dialog/frmsel.cxx | 36 -
svx/source/fmcomp/fmgridif.cxx | 26
svx/source/form/fmdmod.cxx | 40 -
svx/source/form/fmshimp.cxx | 54 -
svx/source/form/fmundo.cxx | 14
svx/source/gallery2/gallery1.cxx | 6
svx/source/inc/docrecovery.hxx | 38 -
svx/source/inc/fmprop.hxx | 226 +++----
svx/source/inc/fmservs.hxx | 98 +--
svx/source/inc/fmurl.hxx | 54 -
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2
svx/source/table/cell.cxx | 16
svx/source/tbxctrls/extrusioncontrols.cxx | 91 +--
svx/source/tbxctrls/grafctrl.cxx | 7
svx/source/unodraw/unoprov.cxx | 194 +++---
svx/source/unodraw/unoshap2.cxx | 80 +-
22 files changed, 942 insertions(+), 948 deletions(-)
New commits:
commit 95bd1f66f879caa13484c408b05d05d1e42075ca
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 26 11:31:44 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 26 14:29:58 2021 +0100
loplugin:stringliteraldefine in svx
Change-Id: I2375ebfe9791c43063ffbc8ddbe1bd365499a576
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125868
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 9ac8339d80b6..de16c6f24214 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -29,13 +29,13 @@ namespace com::sun::star::lang { class XComponent; }
// property names map those from css::gallery::GalleryItem
// with exception of "AsLink" and "FilterName"
-#define SVXGALLERYITEM_TYPE "GalleryItemType"
-#define SVXGALLERYITEM_URL "URL"
-#define SVXGALLERYITEM_FILTER "FilterName"
-#define SVXGALLERYITEM_DRAWING "Drawing"
-#define SVXGALLERYITEM_GRAPHIC "Graphic"
+inline constexpr OUStringLiteral SVXGALLERYITEM_TYPE = u"GalleryItemType";
+inline constexpr OUStringLiteral SVXGALLERYITEM_URL = u"URL";
+inline constexpr OUStringLiteral SVXGALLERYITEM_FILTER = u"FilterName";
+inline constexpr OUStringLiteral SVXGALLERYITEM_DRAWING = u"Drawing";
+inline constexpr OUStringLiteral SVXGALLERYITEM_GRAPHIC = u"Graphic";
#define SVXGALLERYITEM_PARAMS 5
-#define SVXGALLERYITEM_ARGNAME "GalleryItem"
+inline constexpr OUStringLiteral SVXGALLERYITEM_ARGNAME = u"GalleryItem";
class SVXCORE_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem
{
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index ebc79e5ebee5..b20e67ee5dc5 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -223,103 +223,103 @@
{ u"SoftEdgeRadius", SDRATTR_SOFTEDGE_RADIUS,
cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define SHADOW_PROPERTIES \
- { u"" UNO_NAME_SHADOW, SDRATTR_SHADOW,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_SHADOWCOLOR, SDRATTR_SHADOWCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_SHADOWXDIST, SDRATTR_SHADOWXDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_SHADOWYDIST, SDRATTR_SHADOWYDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_SHADOWSIZEX, SDRATTR_SHADOWSIZEX,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_SHADOWSIZEY, SDRATTR_SHADOWSIZEY,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_SHADOWBLUR, SDRATTR_SHADOWBLUR,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
+ { UNO_NAME_SHADOW, SDRATTR_SHADOW,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_SHADOWCOLOR, SDRATTR_SHADOWCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_SHADOWXDIST, SDRATTR_SHADOWXDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_SHADOWYDIST, SDRATTR_SHADOWYDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_SHADOWSIZEX, SDRATTR_SHADOWSIZEX,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_SHADOWSIZEY, SDRATTR_SHADOWSIZEY,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_SHADOWBLUR, SDRATTR_SHADOWBLUR,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define LINE_PROPERTIES_DEFAULTS\
- { u"" UNO_NAME_LINECAP, XATTR_LINECAP,
::cppu::UnoType<css::drawing::LineCap>::get(), 0, 0}, \
- { u"" UNO_NAME_LINECOLOR, XATTR_LINECOLOR,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { u"" UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER,
cppu::UnoType<bool>::get() , 0, 0}, \
- { u"" UNO_NAME_LINEENDWIDTH, XATTR_LINEENDWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_LINEJOINT, XATTR_LINEJOINT,
::cppu::UnoType<css::drawing::LineJoint>::get(), 0, 0}, \
- { u"" UNO_NAME_LINESTARTCENTER, XATTR_LINESTARTCENTER,
cppu::UnoType<bool>::get() , 0, 0}, \
- { u"" UNO_NAME_LINESTARTWIDTH, XATTR_LINESTARTWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_LINESTYLE, XATTR_LINESTYLE,
cppu::UnoType<css::drawing::LineStyle>::get() , 0, 0}, \
- { u"" UNO_NAME_LINETRANSPARENCE, XATTR_LINETRANSPARENCE,
::cppu::UnoType<sal_Int16>::get() , 0, 0}, \
- { u"" UNO_NAME_LINEWIDTH, XATTR_LINEWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM},
+ { UNO_NAME_LINECAP, XATTR_LINECAP,
::cppu::UnoType<css::drawing::LineCap>::get(), 0, 0}, \
+ { UNO_NAME_LINECOLOR, XATTR_LINECOLOR,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
+ { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER,
cppu::UnoType<bool>::get() , 0, 0}, \
+ { UNO_NAME_LINEENDWIDTH, XATTR_LINEENDWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_LINEJOINT, XATTR_LINEJOINT,
::cppu::UnoType<css::drawing::LineJoint>::get(), 0, 0}, \
+ { UNO_NAME_LINESTARTCENTER, XATTR_LINESTARTCENTER,
cppu::UnoType<bool>::get() , 0, 0}, \
+ { UNO_NAME_LINESTARTWIDTH, XATTR_LINESTARTWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_LINESTYLE, XATTR_LINESTYLE,
cppu::UnoType<css::drawing::LineStyle>::get() , 0, 0}, \
+ { UNO_NAME_LINETRANSPARENCE, XATTR_LINETRANSPARENCE,
::cppu::UnoType<sal_Int16>::get() , 0, 0}, \
+ { UNO_NAME_LINEWIDTH, XATTR_LINEWIDTH,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define LINE_PROPERTIES \
- { u"" UNO_NAME_LINEDASH, XATTR_LINEDASH,
::cppu::UnoType<css::drawing::LineDash>::get() , 0, MID_LINEDASH},
\
+ { UNO_NAME_LINEDASH, XATTR_LINEDASH,
::cppu::UnoType<css::drawing::LineDash>::get() , 0, MID_LINEDASH},
\
{ u"LineDashName", XATTR_LINEDASH,
::cppu::UnoType<OUString>::get() , 0, MID_NAME}, \
LINE_PROPERTIES_DEFAULTS
#define LINE_PROPERTIES_START_END \
- { u"" UNO_NAME_LINEEND, XATTR_LINEEND,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { UNO_NAME_LINEEND, XATTR_LINEEND,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ u"LineEndName", XATTR_LINEEND,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
- { u"" UNO_NAME_LINESTART, XATTR_LINESTART,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { UNO_NAME_LINESTART, XATTR_LINESTART,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ u"LineStartName", XATTR_LINESTART,
::cppu::UnoType<OUString>::get(), 0, MID_NAME },
#define FILL_PROPERTIES_BMP \
- { u"" UNO_NAME_FILLBMP_LOGICAL_SIZE, XATTR_FILLBMP_SIZELOG,
cppu::UnoType<bool>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_OFFSET_X, XATTR_FILLBMP_TILEOFFSETX,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_OFFSET_Y, XATTR_FILLBMP_TILEOFFSETY,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_POSITION_OFFSET_X, XATTR_FILLBMP_POSOFFSETX,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_POSITION_OFFSET_Y, XATTR_FILLBMP_POSOFFSETY,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_RECTANGLE_POINT, XATTR_FILLBMP_POS,
::cppu::UnoType<css::drawing::RectanglePoint>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_SIZE_X, XATTR_FILLBMP_SIZEX,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_FILLBMP_SIZE_Y, XATTR_FILLBMP_SIZEY,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_FILLBMP_STRETCH, XATTR_FILLBMP_STRETCH,
cppu::UnoType<bool>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLBMP_TILE, XATTR_FILLBMP_TILE,
cppu::UnoType<bool>::get() , 0, 0},\
- { u"" UNO_NAME_FILLBMP_MODE, OWN_ATTR_FILLBMP_MODE,
::cppu::UnoType<css::drawing::BitmapMode>::get(), 0, 0},
+ { UNO_NAME_FILLBMP_LOGICAL_SIZE, XATTR_FILLBMP_SIZELOG,
cppu::UnoType<bool>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_OFFSET_X, XATTR_FILLBMP_TILEOFFSETX,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_OFFSET_Y, XATTR_FILLBMP_TILEOFFSETY,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_POSITION_OFFSET_X, XATTR_FILLBMP_POSOFFSETX,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_POSITION_OFFSET_Y, XATTR_FILLBMP_POSOFFSETY,
::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_RECTANGLE_POINT, XATTR_FILLBMP_POS,
::cppu::UnoType<css::drawing::RectanglePoint>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_SIZE_X, XATTR_FILLBMP_SIZEX,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_FILLBMP_SIZE_Y, XATTR_FILLBMP_SIZEY,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_FILLBMP_STRETCH, XATTR_FILLBMP_STRETCH,
cppu::UnoType<bool>::get() , 0, 0}, \
+ { UNO_NAME_FILLBMP_TILE, XATTR_FILLBMP_TILE,
cppu::UnoType<bool>::get() , 0, 0},\
+ { UNO_NAME_FILLBMP_MODE, OWN_ATTR_FILLBMP_MODE,
::cppu::UnoType<css::drawing::BitmapMode>::get(), 0, 0},
#define FILL_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_FILLCOLOR, XATTR_FILLCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_FILLCOLOR, XATTR_FILLCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
#define FILL_PROPERTIES \
FILL_PROPERTIES_BMP \
FILL_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_FILLBACKGROUND, XATTR_FILLBACKGROUND ,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_FILLBITMAP, XATTR_FILLBITMAP ,
cppu::UnoType<css::awt::XBitmap>::get() , 0, MID_BITMAP}, \
- { u"" UNO_NAME_FILLBITMAPURL, XATTR_FILLBITMAP ,
cppu::UnoType<OUString>::get(), 0, MID_BITMAP }, \
- { u"" UNO_NAME_FILLBITMAPNAME, XATTR_FILLBITMAP ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
- { u"" UNO_NAME_FILLGRADIENTSTEPCOUNT, XATTR_GRADIENTSTEPCOUNT ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_FILLGRADIENT, XATTR_FILLGRADIENT ,
::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
- { u"" UNO_NAME_FILLGRADIENTNAME, XATTR_FILLGRADIENT ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
- { u"" UNO_NAME_FILLHATCH, XATTR_FILLHATCH ,
::cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \
- { u"" UNO_NAME_FILLHATCHNAME, XATTR_FILLHATCH ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
- { u"" UNO_NAME_FILLSTYLE, XATTR_FILLSTYLE ,
::cppu::UnoType<css::drawing::FillStyle>::get() , 0, 0}, \
- { u"" UNO_NAME_FILL_TRANSPARENCE, XATTR_FILLTRANSPARENCE,
::cppu::UnoType<sal_Int16>::get() , 0, 0}, \
- { u"" UNO_NAME_FILLTRANSPARENCEGRADIENT, XATTR_FILLFLOATTRANSPARENCE,
::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
- { u"" UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
- { u"" UNO_NAME_FILLCOLOR_2, XATTR_SECONDARYFILLCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP ,
::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 },
+ { UNO_NAME_FILLBACKGROUND, XATTR_FILLBACKGROUND ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_FILLBITMAP, XATTR_FILLBITMAP ,
cppu::UnoType<css::awt::XBitmap>::get() , 0, MID_BITMAP}, \
+ { UNO_NAME_FILLBITMAPURL, XATTR_FILLBITMAP ,
cppu::UnoType<OUString>::get(), 0, MID_BITMAP }, \
+ { UNO_NAME_FILLBITMAPNAME, XATTR_FILLBITMAP ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+ { UNO_NAME_FILLGRADIENTSTEPCOUNT, XATTR_GRADIENTSTEPCOUNT ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_FILLGRADIENT, XATTR_FILLGRADIENT ,
::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
+ { UNO_NAME_FILLGRADIENTNAME, XATTR_FILLGRADIENT ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+ { UNO_NAME_FILLHATCH, XATTR_FILLHATCH ,
::cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \
+ { UNO_NAME_FILLHATCHNAME, XATTR_FILLHATCH ,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+ { UNO_NAME_FILLSTYLE, XATTR_FILLSTYLE ,
::cppu::UnoType<css::drawing::FillStyle>::get() , 0, 0}, \
+ { UNO_NAME_FILL_TRANSPARENCE, XATTR_FILLTRANSPARENCE,
::cppu::UnoType<sal_Int16>::get() , 0, 0}, \
+ { UNO_NAME_FILLTRANSPARENCEGRADIENT, XATTR_FILLFLOATTRANSPARENCE,
::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
+ { UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+ { UNO_NAME_FILLCOLOR_2, XATTR_SECONDARYFILLCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP ,
::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 },
#define EDGERADIUS_PROPERTIES \
- { u"" UNO_NAME_EDGERADIUS, SDRATTR_CORNER_RADIUS ,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM},
+ { UNO_NAME_EDGERADIUS, SDRATTR_CORNER_RADIUS ,
::cppu::UnoType<sal_Int32>::get() , 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define TEXT_PROPERTIES_DEFAULTS\
- { u"" UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION,
::cppu::UnoType<css::text::WritingMode>::get(), 0, 0},\
- { u"" UNO_NAME_TEXT_ANIAMOUNT, SDRATTR_TEXT_ANIAMOUNT,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANICOUNT, SDRATTR_TEXT_ANICOUNT,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANIDELAY, SDRATTR_TEXT_ANIDELAY,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANIDIRECTION, SDRATTR_TEXT_ANIDIRECTION,
cppu::UnoType<css::drawing::TextAnimationDirection>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANIKIND, SDRATTR_TEXT_ANIKIND,
cppu::UnoType<css::drawing::TextAnimationKind>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANISTARTINSIDE, SDRATTR_TEXT_ANISTARTINSIDE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_ANISTOPINSIDE, SDRATTR_TEXT_ANISTOPINSIDE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_CONTOURFRAME, SDRATTR_TEXT_CONTOURFRAME,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_FITTOSIZE, SDRATTR_TEXT_FITTOSIZE,
cppu::UnoType<css::drawing::TextFitToSizeType>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_HORZADJUST, SDRATTR_TEXT_HORZADJUST,
cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_LEFTDIST, SDRATTR_TEXT_LEFTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_LOWERDIST, SDRATTR_TEXT_LOWERDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_MAXFRAMEHEIGHT, SDRATTR_TEXT_MAXFRAMEHEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_MAXFRAMEWIDTH, SDRATTR_TEXT_MAXFRAMEWIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_MINFRAMEHEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_MINFRAMEWIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_RIGHTDIST, SDRATTR_TEXT_RIGHTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_TEXT_UPPERDIST, SDRATTR_TEXT_UPPERDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u""
UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING,SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType<bool>::get(),
0, 0}, \
- { u"" UNO_NAME_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST,
cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0},\
- { u"" UNO_NAME_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_TEXT_CHAINNEXTNAME, SDRATTR_TEXT_CHAINNEXTNAME,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION,
::cppu::UnoType<css::text::WritingMode>::get(), 0, 0},\
+ { UNO_NAME_TEXT_ANIAMOUNT, SDRATTR_TEXT_ANIAMOUNT,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANICOUNT, SDRATTR_TEXT_ANICOUNT,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANIDELAY, SDRATTR_TEXT_ANIDELAY,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANIDIRECTION, SDRATTR_TEXT_ANIDIRECTION,
cppu::UnoType<css::drawing::TextAnimationDirection>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANIKIND, SDRATTR_TEXT_ANIKIND,
cppu::UnoType<css::drawing::TextAnimationKind>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANISTARTINSIDE, SDRATTR_TEXT_ANISTARTINSIDE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_ANISTOPINSIDE, SDRATTR_TEXT_ANISTOPINSIDE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_CONTOURFRAME, SDRATTR_TEXT_CONTOURFRAME,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_FITTOSIZE, SDRATTR_TEXT_FITTOSIZE,
cppu::UnoType<css::drawing::TextFitToSizeType>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_HORZADJUST, SDRATTR_TEXT_HORZADJUST,
cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_LEFTDIST, SDRATTR_TEXT_LEFTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_LOWERDIST, SDRATTR_TEXT_LOWERDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_MAXFRAMEHEIGHT, SDRATTR_TEXT_MAXFRAMEHEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_MAXFRAMEWIDTH, SDRATTR_TEXT_MAXFRAMEWIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_MINFRAMEHEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_MINFRAMEWIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_RIGHTDIST, SDRATTR_TEXT_RIGHTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_TEXT_UPPERDIST, SDRATTR_TEXT_UPPERDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ {
UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING,SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType<bool>::get(),
0, 0}, \
+ { UNO_NAME_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST,
cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0},\
+ { UNO_NAME_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_TEXT_CHAINNEXTNAME, SDRATTR_TEXT_CHAINNEXTNAME,
::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"TextColumns", OWN_ATTR_TEXTCOLUMNS,
cppu::UnoType<css::text::XTextColumns>::get(), 0, 0 }, \
SVX_UNOEDIT_CHAR_PROPERTIES, \
SVX_UNOEDIT_PARA_PROPERTIES,
@@ -332,53 +332,53 @@
#define MISC_OBJ_PROPERTIES_NO_SHEAR \
{ u"Transformation", OWN_ATTR_TRANSFORMATION,
cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \
- { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_FRAMERECT, OWN_ATTR_FRAMERECT,
cppu::UnoType<css::awt::Rectangle>::get(), 0, 0 }, \
- { u"" UNO_NAME_MISC_OBJ_ROTATEANGLE, SDRATTR_ROTATEANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_BITMAP, OWN_ATTR_BITMAP,
cppu::UnoType<css::awt::XBitmap>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
- { u"" UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
+ { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_FRAMERECT, OWN_ATTR_FRAMERECT,
cppu::UnoType<css::awt::Rectangle>::get(), 0, 0 }, \
+ { UNO_NAME_MISC_OBJ_ROTATEANGLE, SDRATTR_ROTATEANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_BITMAP, OWN_ATTR_BITMAP,
cppu::UnoType<css::awt::XBitmap>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
+ { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
{ u"IsFontwork", OWN_ATTR_ISFONTWORK,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, \
- { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,
cppu::UnoType<css::awt::Rectangle>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,
cppu::UnoType<css::awt::Rectangle>::get(),
css::beans::PropertyAttribute::READONLY, 0},
#define MISC_OBJ_PROPERTIES \
- { u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG,
cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
\
+ { UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG,
cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
\
MISC_OBJ_PROPERTIES_NO_SHEAR \
- { u"" UNO_NAME_MISC_OBJ_SHEARANGLE, SDRATTR_SHEARANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { UNO_NAME_MISC_OBJ_SHEARANGLE, SDRATTR_SHEARANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
#define SHAPE_DESCRIPTOR_PROPERTIES \
- { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT ,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_NAME, SDRATTR_OBJECTNAME ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_NAME, SDRATTR_OBJECTNAME ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE ,
cppu::UnoType<bool>::get(), 0, 0}, \
{ u"Visible", SDRATTR_OBJVISIBLE ,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT ,
cppu::UnoType<bool>::get(), 0, 0},\
+ { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT ,
cppu::UnoType<bool>::get(), 0, 0},\
{ u"UINameSingular", OWN_ATTR_UINAME_SINGULAR ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
{ u"UINamePlural", OWN_ATTR_UINAME_PLURAL ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
{ u"TextFitToSizeScale", OWN_ATTR_TEXTFITTOSIZESCALE,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
/* #i68101# */ \
- { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_HYPERLINK, OWN_ATTR_HYPERLINK,
::cppu::UnoType<OUString>::get(), 0, 0},
+ { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION ,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_HYPERLINK, OWN_ATTR_HYPERLINK,
::cppu::UnoType<OUString>::get(), 0, 0},
#define LINKTARGET_PROPERTIES \
- { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
- { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP ,
cppu::UnoType<css::awt::XBitmap>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
+ { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP ,
cppu::UnoType<css::awt::XBitmap>::get(),
css::beans::PropertyAttribute::READONLY, 0},
#define CONNECTOR_PROPERTIES \
- { u"" UNO_NAME_EDGEKIND, SDRATTR_EDGEKIND,
::cppu::UnoType<css::drawing::ConnectorType>::get(), 0, 0}, \
- { u"" UNO_NAME_EDGENODE1HORZDIST, SDRATTR_EDGENODE1HORZDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_EDGENODE1VERTDIST, SDRATTR_EDGENODE1VERTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_EDGENODE2HORZDIST, SDRATTR_EDGENODE2HORZDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_EDGENODE2VERTDIST, SDRATTR_EDGENODE2VERTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { UNO_NAME_EDGEKIND, SDRATTR_EDGEKIND,
::cppu::UnoType<css::drawing::ConnectorType>::get(), 0, 0}, \
+ { UNO_NAME_EDGENODE1HORZDIST, SDRATTR_EDGENODE1HORZDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_EDGENODE1VERTDIST, SDRATTR_EDGENODE1VERTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_EDGENODE2HORZDIST, SDRATTR_EDGENODE2HORZDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_EDGENODE2VERTDIST, SDRATTR_EDGENODE2VERTDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
#define SPECIAL_CONNECTOR_PROPERTIES \
CONNECTOR_PROPERTIES \
- { u"" UNO_NAME_EDGELINE1DELTA, SDRATTR_EDGELINE1DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_EDGELINE2DELTA, SDRATTR_EDGELINE2DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_EDGELINE3DELTA, SDRATTR_EDGELINE3DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_EDGELINE1DELTA, SDRATTR_EDGELINE1DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_EDGELINE2DELTA, SDRATTR_EDGELINE2DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_EDGELINE3DELTA, SDRATTR_EDGELINE3DELTA,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
{ u"StartShape", OWN_ATTR_EDGE_START_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ u"StartGluePointIndex", OWN_ATTR_GLUEID_HEAD,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"StartPosition", OWN_ATTR_EDGE_START_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0}, \
@@ -391,28 +391,28 @@
{ u"EdgeEndConnection", OWN_ATTR_EDGE_END_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ u"EdgeEndPoint", OWN_ATTR_EDGE_END_POS,
::cppu::UnoType<css::awt::Point>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
\
- { u"" UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
+ { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
#define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_MEASUREBELOWREFEDGE, SDRATTR_MEASUREBELOWREFEDGE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASUREFORMATSTRING, SDRATTR_MEASUREFORMATSTRING,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASUREHELPLINE1LEN, SDRATTR_MEASUREHELPLINE1LEN,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREHELPLINE2LEN, SDRATTR_MEASUREHELPLINE2LEN,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREHELPLINEDIST, SDRATTR_MEASUREHELPLINEDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREHELPLINEOVERHANG, SDRATTR_MEASUREHELPLINEOVERHANG,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREKIND, SDRATTR_MEASUREKIND,
::cppu::UnoType<css::drawing::MeasureKind>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURELINEDIST, SDRATTR_MEASURELINEDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREOVERHANG, SDRATTR_MEASUREOVERHANG,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_MEASUREUNIT, SDRATTR_MEASUREUNIT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"" UNO_NAME_MEASURESHOWUNIT, SDRATTR_MEASURESHOWUNIT,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTAUTOANGLE, SDRATTR_MEASURETEXTAUTOANGLE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTAUTOANGLEVIEW,
SDRATTR_MEASURETEXTAUTOANGLEVIEW, ::cppu::UnoType<sal_Int32>::get(),
0, 0}, \
- { u"" UNO_NAME_MEASURETEXTFIXEDANGLE, SDRATTR_MEASURETEXTFIXEDANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTHPOS, SDRATTR_MEASURETEXTHPOS,
::cppu::UnoType<css::drawing::MeasureTextHorzPos>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTISFIXEDANGLE, SDRATTR_MEASURETEXTISFIXEDANGLE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTROTA90, SDRATTR_MEASURETEXTROTA90,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTUPSIDEDOWN, SDRATTR_MEASURETEXTUPSIDEDOWN,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_MEASURETEXTVPOS, SDRATTR_MEASURETEXTVPOS,
::cppu::UnoType<css::drawing::MeasureTextVertPos>::get(), 0, 0}, \
+ { UNO_NAME_MEASUREBELOWREFEDGE, SDRATTR_MEASUREBELOWREFEDGE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASUREFORMATSTRING, SDRATTR_MEASUREFORMATSTRING,
::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_MEASUREHELPLINE1LEN, SDRATTR_MEASUREHELPLINE1LEN,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREHELPLINE2LEN, SDRATTR_MEASUREHELPLINE2LEN,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREHELPLINEDIST, SDRATTR_MEASUREHELPLINEDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREHELPLINEOVERHANG, SDRATTR_MEASUREHELPLINEOVERHANG,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREKIND, SDRATTR_MEASUREKIND,
::cppu::UnoType<css::drawing::MeasureKind>::get(), 0, 0}, \
+ { UNO_NAME_MEASURELINEDIST, SDRATTR_MEASURELINEDIST,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREOVERHANG, SDRATTR_MEASUREOVERHANG,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_MEASUREUNIT, SDRATTR_MEASUREUNIT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { UNO_NAME_MEASURESHOWUNIT, SDRATTR_MEASURESHOWUNIT,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTAUTOANGLE, SDRATTR_MEASURETEXTAUTOANGLE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTAUTOANGLEVIEW, SDRATTR_MEASURETEXTAUTOANGLEVIEW,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTFIXEDANGLE, SDRATTR_MEASURETEXTFIXEDANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTHPOS, SDRATTR_MEASURETEXTHPOS,
::cppu::UnoType<css::drawing::MeasureTextHorzPos>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTISFIXEDANGLE, SDRATTR_MEASURETEXTISFIXEDANGLE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTROTA90, SDRATTR_MEASURETEXTROTA90,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTUPSIDEDOWN, SDRATTR_MEASURETEXTUPSIDEDOWN,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_MEASURETEXTVPOS, SDRATTR_MEASURETEXTVPOS,
::cppu::UnoType<css::drawing::MeasureTextVertPos>::get(), 0, 0}, \
{ u"MeasureDecimalPlaces", SDRATTR_MEASUREDECIMALPLACES,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
@@ -422,150 +422,150 @@
{ u"EndPosition", OWN_ATTR_MEASURE_END_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},
#define SPECIAL_CIRCLE_PROPERTIES \
- { u"" UNO_NAME_CIRCENDANGLE, SDRATTR_CIRCENDANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_CIRCKIND, SDRATTR_CIRCKIND,
::cppu::UnoType<css::drawing::CircleKind>::get(), 0, 0}, \
- { u"" UNO_NAME_CIRCSTARTANGLE,SDRATTR_CIRCSTARTANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { UNO_NAME_CIRCENDANGLE, SDRATTR_CIRCENDANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_CIRCKIND, SDRATTR_CIRCKIND,
::cppu::UnoType<css::drawing::CircleKind>::get(), 0, 0}, \
+ { UNO_NAME_CIRCSTARTANGLE,SDRATTR_CIRCSTARTANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
#define SPECIAL_POLYGON_PROPERTIES \
- { u"" UNO_NAME_POLYGONKIND, OWN_ATTR_VALUE_POLYGONKIND,
::cppu::UnoType<css::drawing::PolygonKind>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { UNO_NAME_POLYGONKIND, OWN_ATTR_VALUE_POLYGONKIND,
::cppu::UnoType<css::drawing::PolygonKind>::get(),
css::beans::PropertyAttribute::READONLY, 0},
#define SPECIAL_POLYPOLYGON_PROPERTIES \
- { u"" UNO_NAME_POLYPOLYGON, OWN_ATTR_VALUE_POLYPOLYGON,
::cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0}, \
- { u"" UNO_NAME_POLYGON, OWN_ATTR_VALUE_POLYGON,
::cppu::UnoType<css::drawing::PointSequence>::get(), 0, 0},
+ { UNO_NAME_POLYPOLYGON, OWN_ATTR_VALUE_POLYPOLYGON,
::cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0}, \
+ { UNO_NAME_POLYGON, OWN_ATTR_VALUE_POLYGON,
::cppu::UnoType<css::drawing::PointSequence>::get(), 0, 0},
#define SPECIAL_POLYPOLYGONBEZIER_PROPERTIES \
- { u"" UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_VALUE_POLYPOLYGONBEZIER,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
+ { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_VALUE_POLYPOLYGONBEZIER,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
#define SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_GRAPHIC_LUMINANCE, SDRATTR_GRAFLUMINANCE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_CONTRAST, SDRATTR_GRAFCONTRAST ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_RED, SDRATTR_GRAFRED ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_GREEN, SDRATTR_GRAFGREEN ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_BLUE, SDRATTR_GRAFBLUE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_GAMMA, SDRATTR_GRAFGAMMA ,
cppu::UnoType<double>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_TRANSPARENCY, SDRATTR_GRAFTRANSPARENCE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHIC_COLOR_MODE, SDRATTR_GRAFMODE ,
::cppu::UnoType<css::drawing::ColorMode>::get(), 0, 0},
+ { UNO_NAME_GRAPHIC_LUMINANCE, SDRATTR_GRAFLUMINANCE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_CONTRAST, SDRATTR_GRAFCONTRAST ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_RED, SDRATTR_GRAFRED ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_GREEN, SDRATTR_GRAFGREEN ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_BLUE, SDRATTR_GRAFBLUE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_GAMMA, SDRATTR_GRAFGAMMA ,
cppu::UnoType<double>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_TRANSPARENCY, SDRATTR_GRAFTRANSPARENCE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHIC_COLOR_MODE, SDRATTR_GRAFMODE ,
::cppu::UnoType<css::drawing::ColorMode>::get(), 0, 0},
#define SPECIAL_GRAPHOBJ_PROPERTIES \
SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP
, ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 }, \
- { u"" UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC,
OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get() ,
0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_GRAFSTREAMURL, OWN_ATTR_GRAFSTREAMURL
, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0
}, \
- { u"" UNO_NAME_GRAPHOBJ_FILLBITMAP, OWN_ATTR_VALUE_FILLBITMAP
, cppu::UnoType<css::awt::XBitmap>::get() , 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC
, cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_GRAPHIC_URL, OWN_ATTR_GRAPHIC_URL
, cppu::UnoType<css::uno::Any>::get(), 0, 0 }, \
- { u"" UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE, OWN_ATTR_IS_SIGNATURELINE
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID, OWN_ATTR_SIGNATURELINE_ID
, cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType<OUString>::get(),
0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, cppu::UnoType<OUString>::get(),
0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, cppu::UnoType<OUString>::get(),
0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS,
OWN_ATTR_SIGNATURELINE_SIGNING_INSTRUCTIONS, cppu::UnoType<OUString>::get(), 0,
0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE,
OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT,
OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE,
OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE,
cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED,
OWN_ATTR_SIGNATURELINE_IS_SIGNED , cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_GRAPHOBJ_QRCODE, OWN_ATTR_QRCODE ,
cppu::UnoType<css::drawing::BarCode>::get(), 0, 0},
+ { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP ,
::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 }, \
+ { UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC, OWN_ATTR_REPLACEMENT_GRAPHIC,
cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_GRAFSTREAMURL, OWN_ATTR_GRAFSTREAMURL ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0
}, \
+ { UNO_NAME_GRAPHOBJ_FILLBITMAP, OWN_ATTR_VALUE_FILLBITMAP ,
cppu::UnoType<css::awt::XBitmap>::get() , 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC ,
cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_GRAPHIC_URL, OWN_ATTR_GRAPHIC_URL ,
cppu::UnoType<css::uno::Any>::get(), 0, 0 }, \
+ { UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE, OWN_ATTR_IS_SIGNATURELINE ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID, OWN_ATTR_SIGNATURELINE_ID ,
cppu::UnoType<OUString>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType<OUString>::get(),
0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, cppu::UnoType<OUString>::get(),
0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL,
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, cppu::UnoType<OUString>::get(),
0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS,
OWN_ATTR_SIGNATURELINE_SIGNING_INSTRUCTIONS, cppu::UnoType<OUString>::get(), 0,
0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE,
OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT,
OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE,
OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE,
cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED,
OWN_ATTR_SIGNATURELINE_IS_SIGNED , cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_GRAPHOBJ_QRCODE, OWN_ATTR_QRCODE ,
cppu::UnoType<css::drawing::BarCode>::get(), 0, 0},
#define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_3D_SCENE_AMBIENTCOLOR, SDRATTR_3DSCENE_AMBIENTCOLOR ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_DISTANCE, SDRATTR_3DSCENE_DISTANCE ,
::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_3D_SCENE_FOCAL_LENGTH, SDRATTR_3DSCENE_FOCAL_LENGTH ,
::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_1, SDRATTR_3DSCENE_LIGHTCOLOR_1
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_2, SDRATTR_3DSCENE_LIGHTCOLOR_2
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_3, SDRATTR_3DSCENE_LIGHTCOLOR_3
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_4, SDRATTR_3DSCENE_LIGHTCOLOR_4
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_5, SDRATTR_3DSCENE_LIGHTCOLOR_5
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_6, SDRATTR_3DSCENE_LIGHTCOLOR_6
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_7, SDRATTR_3DSCENE_LIGHTCOLOR_7
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_8, SDRATTR_3DSCENE_LIGHTCOLOR_8
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, SDRATTR_3DSCENE_LIGHTDIRECTION_1
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, SDRATTR_3DSCENE_LIGHTDIRECTION_2
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, SDRATTR_3DSCENE_LIGHTDIRECTION_3
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, SDRATTR_3DSCENE_LIGHTDIRECTION_4
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, SDRATTR_3DSCENE_LIGHTDIRECTION_5
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, SDRATTR_3DSCENE_LIGHTDIRECTION_6
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, SDRATTR_3DSCENE_LIGHTDIRECTION_7
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, SDRATTR_3DSCENE_LIGHTDIRECTION_8
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_1, SDRATTR_3DSCENE_LIGHTON_1
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_2, SDRATTR_3DSCENE_LIGHTON_2
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_3, SDRATTR_3DSCENE_LIGHTON_3
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_4, SDRATTR_3DSCENE_LIGHTON_4
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_5, SDRATTR_3DSCENE_LIGHTON_5
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_6, SDRATTR_3DSCENE_LIGHTON_6
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_7, SDRATTR_3DSCENE_LIGHTON_7
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_LIGHTON_8, SDRATTR_3DSCENE_LIGHTON_8
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_PERSPECTIVE, SDRATTR_3DSCENE_PERSPECTIVE ,
cppu::UnoType<css::drawing::ProjectionMode>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_SHADOW_SLANT, SDRATTR_3DSCENE_SHADOW_SLANT ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SCENE_SHADE_MODE, SDRATTR_3DSCENE_SHADE_MODE ,
::cppu::UnoType<css::drawing::ShadeMode>::get(), 0, 0}, \
- { u""
UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING,SDRATTR_3DSCENE_TWO_SIDED_LIGHTING,
cppu::UnoType<bool>::get(), 0, 0},
+ { UNO_NAME_3D_SCENE_AMBIENTCOLOR, SDRATTR_3DSCENE_AMBIENTCOLOR ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_DISTANCE, SDRATTR_3DSCENE_DISTANCE ,
::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_3D_SCENE_FOCAL_LENGTH, SDRATTR_3DSCENE_FOCAL_LENGTH ,
::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_1, SDRATTR_3DSCENE_LIGHTCOLOR_1 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_2, SDRATTR_3DSCENE_LIGHTCOLOR_2 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_3, SDRATTR_3DSCENE_LIGHTCOLOR_3 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_4, SDRATTR_3DSCENE_LIGHTCOLOR_4 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_5, SDRATTR_3DSCENE_LIGHTCOLOR_5 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_6, SDRATTR_3DSCENE_LIGHTCOLOR_6 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_7, SDRATTR_3DSCENE_LIGHTCOLOR_7 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTCOLOR_8, SDRATTR_3DSCENE_LIGHTCOLOR_8 ,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, SDRATTR_3DSCENE_LIGHTDIRECTION_1 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, SDRATTR_3DSCENE_LIGHTDIRECTION_2 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, SDRATTR_3DSCENE_LIGHTDIRECTION_3 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, SDRATTR_3DSCENE_LIGHTDIRECTION_4 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, SDRATTR_3DSCENE_LIGHTDIRECTION_5 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, SDRATTR_3DSCENE_LIGHTDIRECTION_6 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, SDRATTR_3DSCENE_LIGHTDIRECTION_7 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, SDRATTR_3DSCENE_LIGHTDIRECTION_8 ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_1, SDRATTR_3DSCENE_LIGHTON_1 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_2, SDRATTR_3DSCENE_LIGHTON_2 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_3, SDRATTR_3DSCENE_LIGHTON_3 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_4, SDRATTR_3DSCENE_LIGHTON_4 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_5, SDRATTR_3DSCENE_LIGHTON_5 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_6, SDRATTR_3DSCENE_LIGHTON_6 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_7, SDRATTR_3DSCENE_LIGHTON_7 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_LIGHTON_8, SDRATTR_3DSCENE_LIGHTON_8 ,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_PERSPECTIVE, SDRATTR_3DSCENE_PERSPECTIVE ,
cppu::UnoType<css::drawing::ProjectionMode>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_SHADOW_SLANT, SDRATTR_3DSCENE_SHADOW_SLANT ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_SHADE_MODE, SDRATTR_3DSCENE_SHADE_MODE ,
::cppu::UnoType<css::drawing::ShadeMode>::get(), 0, 0}, \
+ { UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING,SDRATTR_3DSCENE_TWO_SIDED_LIGHTING,
cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DSCENEOBJECT_PROPERTIES \
SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX,
OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX ,
::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_CAMERA_GEOMETRY,
OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY ,
::cppu::UnoType<css::drawing::CameraGeometry>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX, OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX
, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+ { UNO_NAME_3D_CAMERA_GEOMETRY, OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY
, ::cppu::UnoType<css::drawing::CameraGeometry>::get(), 0, 0},
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)
#define MISC_3D_OBJ_PROPERTIES \
- { u"" UNO_NAME_3D_DOUBLE_SIDED ,SDRATTR_3DOBJ_DOUBLE_SIDED
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_MAT_COLOR ,SDRATTR_3DOBJ_MAT_COLOR
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_MAT_EMISSION ,SDRATTR_3DOBJ_MAT_EMISSION
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_MAT_SPECULAR ,SDRATTR_3DOBJ_MAT_SPECULAR
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_MAT_SPECULAR_INTENSITY
,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::cppu::UnoType<sal_Int16>::get(), 0,
0}, \
- { u"" UNO_NAME_3D_NORMALS_INVERT ,SDRATTR_3DOBJ_NORMALS_INVERT
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_NORMALS_KIND ,SDRATTR_3DOBJ_NORMALS_KIND
, ::cppu::UnoType<css::drawing::NormalsKind>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SHADOW_3D ,SDRATTR_3DOBJ_SHADOW_3D
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTURE_FILTER ,SDRATTR_3DOBJ_TEXTURE_FILTER
, cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTURE_KIND ,SDRATTR_3DOBJ_TEXTURE_KIND
, ::cppu::UnoType<css::drawing::TextureKind>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTURE_MODE ,SDRATTR_3DOBJ_TEXTURE_MODE
, ::cppu::UnoType<css::drawing::TextureMode>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTURE_PROJ_X ,SDRATTR_3DOBJ_TEXTURE_PROJ_X
, ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTURE_PROJ_Y ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y
, ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_REDUCED_LINE_GEOMETRY
,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , cppu::UnoType<bool>::get(), 0, 0},
+ { UNO_NAME_3D_DOUBLE_SIDED ,SDRATTR_3DOBJ_DOUBLE_SIDED
, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_MAT_COLOR ,SDRATTR_3DOBJ_MAT_COLOR
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_MAT_EMISSION ,SDRATTR_3DOBJ_MAT_EMISSION
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_MAT_SPECULAR ,SDRATTR_3DOBJ_MAT_SPECULAR
, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_MAT_SPECULAR_INTENSITY
,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::cppu::UnoType<sal_Int16>::get(), 0,
0}, \
+ { UNO_NAME_3D_NORMALS_INVERT ,SDRATTR_3DOBJ_NORMALS_INVERT
, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_NORMALS_KIND ,SDRATTR_3DOBJ_NORMALS_KIND
, ::cppu::UnoType<css::drawing::NormalsKind>::get(), 0, 0}, \
+ { UNO_NAME_3D_SHADOW_3D ,SDRATTR_3DOBJ_SHADOW_3D
, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTURE_FILTER ,SDRATTR_3DOBJ_TEXTURE_FILTER
, cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTURE_KIND ,SDRATTR_3DOBJ_TEXTURE_KIND
, ::cppu::UnoType<css::drawing::TextureKind>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTURE_MODE ,SDRATTR_3DOBJ_TEXTURE_MODE
, ::cppu::UnoType<css::drawing::TextureMode>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTURE_PROJ_X ,SDRATTR_3DOBJ_TEXTURE_PROJ_X
, ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTURE_PROJ_Y ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y
, ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
+ { UNO_NAME_3D_REDUCED_LINE_GEOMETRY
,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DCUBEOBJECT_PROPERTIES \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX
, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_POS ,OWN_ATTR_3D_VALUE_POSITION
, cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SIZE ,OWN_ATTR_3D_VALUE_SIZE
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_POS_IS_CENTER ,OWN_ATTR_3D_VALUE_POS_IS_CENTER
, cppu::UnoType<bool>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX ,
::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+ { UNO_NAME_3D_POS ,OWN_ATTR_3D_VALUE_POSITION ,
cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SIZE ,OWN_ATTR_3D_VALUE_SIZE ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_POS_IS_CENTER ,OWN_ATTR_3D_VALUE_POS_IS_CENTER ,
cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DSPHEREOBJECT_PROPERTIES \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX
, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_POS ,OWN_ATTR_3D_VALUE_POSITION
, cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SIZE ,OWN_ATTR_3D_VALUE_SIZE
, ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_HORZ_SEGS ,SDRATTR_3DOBJ_HORZ_SEGS,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_VERT_SEGS ,SDRATTR_3DOBJ_VERT_SEGS,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX ,
::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+ { UNO_NAME_3D_POS ,OWN_ATTR_3D_VALUE_POSITION ,
cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_SIZE ,OWN_ATTR_3D_VALUE_SIZE ,
::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_HORZ_SEGS ,SDRATTR_3DOBJ_HORZ_SEGS,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_VERT_SEGS ,SDRATTR_3DOBJ_VERT_SEGS,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
// #107245# New 3D properties which are possible for lathe and extrude 3d
objects
#define SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES \
- { u"" UNO_NAME_3D_SMOOTH_NORMALS , SDRATTR_3DOBJ_SMOOTH_NORMALS,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_SMOOTH_LIDS , SDRATTR_3DOBJ_SMOOTH_LIDS,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_CHARACTER_MODE , SDRATTR_3DOBJ_CHARACTER_MODE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_CLOSE_FRONT , SDRATTR_3DOBJ_CLOSE_FRONT,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_CLOSE_BACK , SDRATTR_3DOBJ_CLOSE_BACK,
cppu::UnoType<bool>::get(), 0, 0},
+ { UNO_NAME_3D_SMOOTH_NORMALS , SDRATTR_3DOBJ_SMOOTH_NORMALS,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_SMOOTH_LIDS , SDRATTR_3DOBJ_SMOOTH_LIDS,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_CHARACTER_MODE , SDRATTR_3DOBJ_CHARACTER_MODE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_CLOSE_FRONT , SDRATTR_3DOBJ_CLOSE_FRONT,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { UNO_NAME_3D_CLOSE_BACK , SDRATTR_3DOBJ_CLOSE_BACK,
cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DLATHEOBJECT_PROPERTIES \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX
,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(),
0, 0}, \
- { u"" UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D
,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_LATHE_END_ANGLE ,SDRATTR_3DOBJ_END_ANGLE
,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_HORZ_SEGS ,SDRATTR_3DOBJ_HORZ_SEGS
,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL
,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_VERT_SEGS ,SDRATTR_3DOBJ_VERT_SEGS
,::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX
,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(),
0, 0}, \
+ { UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D
,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_LATHE_END_ANGLE ,SDRATTR_3DOBJ_END_ANGLE
,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_3D_HORZ_SEGS ,SDRATTR_3DOBJ_HORZ_SEGS
,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL
,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_3D_VERT_SEGS ,SDRATTR_3DOBJ_VERT_SEGS
,::cppu::UnoType<sal_Int32>::get(), 0, 0},
#define SPECIAL_3DEXTRUDEOBJECT_PROPERTIES \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX
,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(),
0, 0}, \
- { u"" UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D
,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_EXTRUDE_DEPTH ,SDRATTR_3DOBJ_DEPTH
,::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
- { u"" UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL
,::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX
,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(),
0, 0}, \
+ { UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D
,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_EXTRUDE_DEPTH ,SDRATTR_3DOBJ_DEPTH
,::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
+ { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL
,::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define SPECIAL_3DPOLYGONOBJECT_PROPERTIES \
- { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,
::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_NORMALSPOLYGON3D ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_TEXTUREPOLYGON3D ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { u"" UNO_NAME_3D_LINEONLY ,OWN_ATTR_3D_VALUE_LINEONLY ,
cppu::UnoType<bool>::get(), 0, 0},
+ { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,
::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+ { UNO_NAME_3D_POLYPOLYGON3D ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_NORMALSPOLYGON3D ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_TEXTUREPOLYGON3D ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D,
::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+ { UNO_NAME_3D_LINEONLY ,OWN_ATTR_3D_VALUE_LINEONLY ,
cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DBACKSCALE_PROPERTIES \
- { u"" UNO_NAME_3D_BACKSCALE ,SDRATTR_3DOBJ_BACKSCALE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+ { UNO_NAME_3D_BACKSCALE ,SDRATTR_3DOBJ_BACKSCALE ,
::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
#endif
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index b96076c0622d..979bcb1891fe 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -6,167 +6,167 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#pragma once
-#ifndef INCLUDED_SVX_INC_BITMAPS_HRC
-#define INCLUDED_SVX_INC_BITMAPS_HRC
+#include <rtl/ustring.hxx>
-#define RID_SVXCTRL_RECTBTNS "svx/res/rectbtns.png"
+inline constexpr OUStringLiteral RID_SVXCTRL_RECTBTNS =
u"svx/res/rectbtns.png";
-#define RID_SVXBMP_FRMSEL_ARROW1 "svx/res/frmsel1.png"
-#define RID_SVXBMP_FRMSEL_ARROW2 "svx/res/frmsel2.png"
-#define RID_SVXBMP_FRMSEL_ARROW3 "svx/res/frmsel3.png"
-#define RID_SVXBMP_FRMSEL_ARROW4 "svx/res/frmsel4.png"
-#define RID_SVXBMP_FRMSEL_ARROW5 "svx/res/frmsel5.png"
-#define RID_SVXBMP_FRMSEL_ARROW6 "svx/res/frmsel6.png"
-#define RID_SVXBMP_FRMSEL_ARROW7 "svx/res/frmsel7.png"
-#define RID_SVXBMP_FRMSEL_ARROW8 "svx/res/frmsel8.png"
-#define RID_SVXBMP_FRMSEL_ARROW9 "svx/res/frmsel9.png"
-#define RID_SVXBMP_FRMSEL_ARROW10 "svx/res/frmsel10.png"
-#define RID_SVXBMP_FRMSEL_ARROW11 "svx/res/frmsel11.png"
-#define RID_SVXBMP_FRMSEL_ARROW12 "svx/res/frmsel12.png"
-#define RID_SVXBMP_FRMSEL_ARROW13 "svx/res/frmsel13.png"
-#define RID_SVXBMP_FRMSEL_ARROW14 "svx/res/frmsel14.png"
-#define RID_SVXBMP_FRMSEL_ARROW15 "svx/res/frmsel15.png"
-#define RID_SVXBMP_FRMSEL_ARROW16 "svx/res/frmsel16.png"
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW1 =
u"svx/res/frmsel1.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW2 =
u"svx/res/frmsel2.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW3 =
u"svx/res/frmsel3.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW4 =
u"svx/res/frmsel4.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW5 =
u"svx/res/frmsel5.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW6 =
u"svx/res/frmsel6.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW7 =
u"svx/res/frmsel7.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW8 =
u"svx/res/frmsel8.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW9 =
u"svx/res/frmsel9.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW10 =
u"svx/res/frmsel10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW11 =
u"svx/res/frmsel11.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW12 =
u"svx/res/frmsel12.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW13 =
u"svx/res/frmsel13.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW14 =
u"svx/res/frmsel14.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW15 =
u"svx/res/frmsel15.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRMSEL_ARROW16 =
u"svx/res/frmsel16.png";
-#define RID_SVXBMP_NOTCHECKED "svx/res/notcheck.png"
-#define RID_SVXBMP_CHECKED "svx/res/lngcheck.png"
+inline constexpr OUStringLiteral RID_SVXBMP_NOTCHECKED =
u"svx/res/notcheck.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CHECKED = u"svx/res/lngcheck.png";
-#define RID_SVXBMP_GREENCHECK "svx/res/nu01.png"
-#define RID_SVXBMP_YELLOWCHECK "svx/res/nu04.png"
-#define RID_SVXBMP_REDCROSS "svx/res/nu02.png"
-#define RID_SVXBMP_SHADOW_ANGLE "svx/res/fw018.png"
-#define RID_SVXBMP_SHADOW_SIZE "svx/res/fw019.png"
-#define RID_SVXBMP_SHADOW_XDIST "svx/res/fw016.png"
-#define RID_SVXBMP_SHADOW_YDIST "svx/res/fw017.png"
+inline constexpr OUStringLiteral RID_SVXBMP_GREENCHECK = u"svx/res/nu01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_YELLOWCHECK = u"svx/res/nu04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_REDCROSS = u"svx/res/nu02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_ANGLE =
u"svx/res/fw018.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_SIZE = u"svx/res/fw019.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_XDIST =
u"svx/res/fw016.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_YDIST =
u"svx/res/fw017.png";
-#define RID_SVXBMP_DIRECTION_DIRECTION_NW
"svx/res/directionnorthwest_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_N
"svx/res/directionnorth_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_NE
"svx/res/directionnortheast_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_W
"svx/res/directionwest_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_NONE
"svx/res/directionstraight_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_E
"svx/res/directioneast_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_SW
"svx/res/directionsouthwest_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_S
"svx/res/directionsouth_22.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_SE
"svx/res/directionsoutheast_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT
"svx/res/lightofffromtopleft_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP
"svx/res/lightofffromtop_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT
"svx/res/lightofffromtopright_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_LEFT
"svx/res/lightofffromleft_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_RIGHT
"svx/res/lightofffromright_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT
"svx/res/lightofffrombottomleft_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM
"svx/res/lightofffrombottom_22.png"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
"svx/res/lightofffrombottomright_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT
"svx/res/lightonfromtopleft_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP
"svx/res/lightonfromtop_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT
"svx/res/lightonfromtopright_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_LEFT
"svx/res/lightonfromleft_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_RIGHT
"svx/res/lightonfromright_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT
"svx/res/lightonfrombottomleft_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM
"svx/res/lightonfrombottom_22.png"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
"svx/res/lightonfrombottomright_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT
"svx/res/lightfromtopleft_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP
"svx/res/lightfromtop_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT
"svx/res/lightfromtopright_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT
"svx/res/lightfromleft_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT
"svx/res/lightfromright_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT
"svx/res/lightfromfront_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT
"svx/res/lightfrombottomleft_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM
"svx/res/lightfrombottom_22.png"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
"svx/res/lightfrombottomright_22.png"
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_NW =
u"svx/res/directionnorthwest_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_N =
u"svx/res/directionnorth_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_NE =
u"svx/res/directionnortheast_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_W =
u"svx/res/directionwest_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_NONE =
u"svx/res/directionstraight_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_E =
u"svx/res/directioneast_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_SW =
u"svx/res/directionsouthwest_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_S =
u"svx/res/directionsouth_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DIRECTION_DIRECTION_SE =
u"svx/res/directionsoutheast_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT =
u"svx/res/lightofffromtopleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_TOP =
u"svx/res/lightofffromtop_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT =
u"svx/res/lightofffromtopright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_LEFT =
u"svx/res/lightofffromleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_RIGHT =
u"svx/res/lightofffromright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT =
u"svx/res/lightofffrombottomleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM =
u"svx/res/lightofffrombottom_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT =
u"svx/res/lightofffrombottomright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT =
u"svx/res/lightonfromtopleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_TOP =
u"svx/res/lightonfromtop_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT =
u"svx/res/lightonfromtopright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_LEFT =
u"svx/res/lightonfromleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_RIGHT =
u"svx/res/lightonfromright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT =
u"svx/res/lightonfrombottomleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_BOTTOM =
u"svx/res/lightonfrombottom_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT =
u"svx/res/lightonfrombottomright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT =
u"svx/res/lightfromtopleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP =
u"svx/res/lightfromtop_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT =
u"svx/res/lightfromtopright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT =
u"svx/res/lightfromleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT =
u"svx/res/lightfromright_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT =
u"svx/res/lightfromfront_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT =
u"svx/res/lightfrombottomleft_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM =
u"svx/res/lightfrombottom_22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT =
u"svx/res/lightfrombottomright_22.png";
-#define RID_SVXBMP_LAMP_ON "svx/res/lighton.png"
-#define RID_SVXBMP_LAMP_OFF "svx/res/light.png"
+inline constexpr OUStringLiteral RID_SVXBMP_LAMP_ON = u"svx/res/lighton.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LAMP_OFF = u"svx/res/light.png";
-#define RID_SVXBMP_ELEMENT "res/da03.png"
-#define RID_SVXBMP_ATTRIBUTE "res/da04.png"
-#define RID_SVXBMP_TEXT "res/da05.png"
-#define RID_SVXBMP_OTHER "res/da06.png"
+inline constexpr OUStringLiteral RID_SVXBMP_ELEMENT = u"res/da03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_ATTRIBUTE = u"res/da04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TEXT = u"res/da05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_OTHER = u"res/da06.png";
-#define RID_SVXBMP_FORM "res/sx10593.png"
-#define RID_SVXBMP_CONTROL "res/sx10144.png"
+inline constexpr OUStringLiteral RID_SVXBMP_FORM = u"res/sx10593.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CONTROL = u"res/sx10144.png";
#define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png"
#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
-#define RID_SVXBMP_BUTTON "res/sx10594.png"
-#define RID_SVXBMP_RADIOBUTTON "res/sx10595.png"
-#define RID_SVXBMP_CHECKBOX "res/sx10596.png"
-#define RID_SVXBMP_FIXEDTEXT "res/sx10597.png"
-#define RID_SVXBMP_GROUPBOX "res/sx10598.png"
-#define RID_SVXBMP_EDITBOX "res/sx10599.png"
-#define RID_SVXBMP_LISTBOX "res/sx10600.png"
-#define RID_SVXBMP_COMBOBOX "res/sx10601.png"
-#define RID_SVXBMP_FORMS "res/sx18013.png"
-#define RID_SVXBMP_IMAGEBUTTON "res/sx10604.png"
-#define RID_SVXBMP_IMAGECONTROL "res/sx10710.png"
-#define RID_SVXBMP_FILECONTROL "res/sx10605.png"
-#define RID_SVXBMP_DATEFIELD "res/sx10704.png"
-#define RID_SVXBMP_TIMEFIELD "res/sx10705.png"
-#define RID_SVXBMP_NUMERICFIELD "res/sx10706.png"
-#define RID_SVXBMP_CURRENCYFIELD "res/sx10707.png"
-#define RID_SVXBMP_PATTERNFIELD "res/sx10708.png"
-#define RID_SVXBMP_HIDDEN "res/sx18022.png"
-#define RID_SVXBMP_GRID "res/sx10603.png"
-#define RID_SVXBMP_FORMATTEDFIELD "res/sx10728.png"
-#define RID_SVXBMP_FILTER "res/sx10715.png"
-#define RID_SVXBMP_DATE_N_TIME_FIELDS "res/sx10757.png"
-#define RID_SVXBMP_FIELD "res/sx18027.png"
-#define RID_SVXBMP_SCROLLBAR "res/sx10768.png"
-#define RID_SVXBMP_SPINBUTTON "res/sx10769.png"
-#define RID_SVXBMP_NAVIGATIONBAR "res/sx10607.png"
+inline constexpr OUStringLiteral RID_SVXBMP_BUTTON = u"res/sx10594.png";
+inline constexpr OUStringLiteral RID_SVXBMP_RADIOBUTTON = u"res/sx10595.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CHECKBOX = u"res/sx10596.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FIXEDTEXT = u"res/sx10597.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GROUPBOX = u"res/sx10598.png";
+inline constexpr OUStringLiteral RID_SVXBMP_EDITBOX = u"res/sx10599.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LISTBOX = u"res/sx10600.png";
+inline constexpr OUStringLiteral RID_SVXBMP_COMBOBOX = u"res/sx10601.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FORMS = u"res/sx18013.png";
+inline constexpr OUStringLiteral RID_SVXBMP_IMAGEBUTTON = u"res/sx10604.png";
+inline constexpr OUStringLiteral RID_SVXBMP_IMAGECONTROL = u"res/sx10710.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FILECONTROL = u"res/sx10605.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DATEFIELD = u"res/sx10704.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TIMEFIELD = u"res/sx10705.png";
+inline constexpr OUStringLiteral RID_SVXBMP_NUMERICFIELD = u"res/sx10706.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CURRENCYFIELD = u"res/sx10707.png";
+inline constexpr OUStringLiteral RID_SVXBMP_PATTERNFIELD = u"res/sx10708.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HIDDEN = u"res/sx18022.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRID = u"res/sx10603.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FORMATTEDFIELD =
u"res/sx10728.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FILTER = u"res/sx10715.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DATE_N_TIME_FIELDS =
u"res/sx10757.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FIELD = u"res/sx18027.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SCROLLBAR = u"res/sx10768.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SPINBUTTON = u"res/sx10769.png";
+inline constexpr OUStringLiteral RID_SVXBMP_NAVIGATIONBAR = u"res/sx10607.png";
-#define RID_SVXBMP_THEME_NORMAL "svx/res/galnors.png"
-#define RID_SVXBMP_THEME_READONLY "svx/res/galrdos.png"
-#define RID_SVXBMP_THEME_DEFAULT "svx/res/galdefs.png"
-#define RID_SVXBMP_GALLERY_MEDIA "svx/res/galmedia.png"
-#define RID_SVXBMP_GALLERY_SOUND_1 "svx/res/galsnd1.png"
-#define RID_SVXBMP_GALLERY_SOUND_2 "svx/res/galsnd2.png"
-#define RID_SVXBMP_GALLERY_SOUND_3 "svx/res/galsnd3.png"
-#define RID_SVXBMP_GALLERY_SOUND_4 "svx/res/galsnd4.png"
-#define RID_SVXBMP_GALLERY_SOUND_5 "svx/res/galsnd5.png"
-#define RID_SVXBMP_GALLERY_SOUND_6 "svx/res/galsnd6.png"
-#define RID_SVXBMP_GALLERY_SOUND_7 "svx/res/galsnd7.png"
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_NORMAL =
u"svx/res/galnors.png";
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_READONLY =
u"svx/res/galrdos.png";
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_DEFAULT =
u"svx/res/galdefs.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_MEDIA =
u"svx/res/galmedia.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_1 =
u"svx/res/galsnd1.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_2 =
u"svx/res/galsnd2.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_3 =
u"svx/res/galsnd3.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_4 =
u"svx/res/galsnd4.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_5 =
u"svx/res/galsnd5.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_6 =
u"svx/res/galsnd6.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GALLERY_SOUND_7 =
u"svx/res/galsnd7.png";
-#define BMP_NONE_ICON
"svx/res/symphony/blank.png"
-#define BMP_WIDTH1_ICON
"svx/res/symphony/width1.png"
-#define BMP_WIDTH2_ICON
"svx/res/symphony/width2.png"
-#define BMP_WIDTH3_ICON
"svx/res/symphony/width3.png"
-#define BMP_WIDTH4_ICON
"svx/res/symphony/width4.png"
-#define BMP_WIDTH5_ICON
"svx/res/symphony/width5.png"
-#define BMP_WIDTH6_ICON
"svx/res/symphony/width6.png"
-#define BMP_WIDTH7_ICON
"svx/res/symphony/width7.png"
-#define BMP_WIDTH8_ICON
"svx/res/symphony/width8.png"
-#define RID_SVXBMP_WIDTH_CUSTOM
"svx/res/symphony/last_custom_common.png"
-#define RID_SVXBMP_WIDTH_CUSTOM_GRAY
"svx/res/symphony/last_custom_common_grey.png"
+inline constexpr OUStringLiteral BMP_NONE_ICON = u"svx/res/symphony/blank.png";
+inline constexpr OUStringLiteral BMP_WIDTH1_ICON =
u"svx/res/symphony/width1.png";
+inline constexpr OUStringLiteral BMP_WIDTH2_ICON =
u"svx/res/symphony/width2.png";
+inline constexpr OUStringLiteral BMP_WIDTH3_ICON =
u"svx/res/symphony/width3.png";
+inline constexpr OUStringLiteral BMP_WIDTH4_ICON =
u"svx/res/symphony/width4.png";
+inline constexpr OUStringLiteral BMP_WIDTH5_ICON =
u"svx/res/symphony/width5.png";
+inline constexpr OUStringLiteral BMP_WIDTH6_ICON =
u"svx/res/symphony/width6.png";
+inline constexpr OUStringLiteral BMP_WIDTH7_ICON =
u"svx/res/symphony/width7.png";
+inline constexpr OUStringLiteral BMP_WIDTH8_ICON =
u"svx/res/symphony/width8.png";
+inline constexpr OUStringLiteral RID_SVXBMP_WIDTH_CUSTOM =
u"svx/res/symphony/last_custom_common.png";
+inline constexpr OUStringLiteral RID_SVXBMP_WIDTH_CUSTOM_GRAY =
u"svx/res/symphony/last_custom_common_grey.png";
-#define BMP_AXIAL
"svx/res/symphony/axial.png"
-#define BMP_ELLI
"svx/res/symphony/ellipsoid.png"
-#define BMP_QUAD
"svx/res/symphony/Quadratic.png"
-#define BMP_RADIAL
"svx/res/symphony/radial.png"
-#define BMP_SQUARE
"svx/res/symphony/Square.png"
-#define BMP_LINEAR
"svx/res/symphony/linear.png"
+inline constexpr OUStringLiteral BMP_AXIAL = u"svx/res/symphony/axial.png";
+inline constexpr OUStringLiteral BMP_ELLI = u"svx/res/symphony/ellipsoid.png";
+inline constexpr OUStringLiteral BMP_QUAD = u"svx/res/symphony/Quadratic.png";
+inline constexpr OUStringLiteral BMP_RADIAL = u"svx/res/symphony/radial.png";
+inline constexpr OUStringLiteral BMP_SQUARE = u"svx/res/symphony/Square.png";
+inline constexpr OUStringLiteral BMP_LINEAR = u"svx/res/symphony/linear.png";
-#define RID_SVXBMP_STANDARD_SELECTION
"svx/res/standard-selection_10x22.png"
-#define RID_SVXBMP_EXTENDING_SELECTION
"svx/res/extending-selection_10x22.png"
-#define RID_SVXBMP_ADDING_SELECTION
"svx/res/adding-selection_10x22.png"
-#define RID_SVXBMP_BLOCK_SELECTION
"svx/res/block-selection_10x22.png"
-#define RID_SVXBMP_POSITION "res/sc10223.png"
-#define RID_SVXBMP_SIZE "res/sc10224.png"
-#define RID_SVXBMP_SIGNET "svx/res/signet_11x16.png"
-#define RID_SVXBMP_SIGNET_BROKEN "svx/res/caution_11x16.png"
-#define RID_SVXBMP_SIGNET_NOTVALIDATED
"svx/res/notcertificate_16.png"
-#define RID_SVXBMP_SLIDERBUTTON
"svx/res/slidezoombutton_10.png"
-#define RID_SVXBMP_SLIDERDECREASE
"svx/res/slidezoomout_10.png"
-#define RID_SVXBMP_SLIDERINCREASE
"svx/res/slidezoomin_10.png"
-#define RID_SVXBMP_DOC_MODIFIED_YES
"svx/res/doc_modified_yes_14.png"
-#define RID_SVXBMP_DOC_MODIFIED_NO
"svx/res/doc_modified_no_14.png"
-#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK
"svx/res/doc_modified_feedback.png"
-#define RID_SVXBMP_ZOOM_PAGE
"svx/res/zoom_page_statusbar.png"
+inline constexpr OUStringLiteral RID_SVXBMP_STANDARD_SELECTION =
u"svx/res/standard-selection_10x22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_EXTENDING_SELECTION =
u"svx/res/extending-selection_10x22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_ADDING_SELECTION =
u"svx/res/adding-selection_10x22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_BLOCK_SELECTION =
u"svx/res/block-selection_10x22.png";
+inline constexpr OUStringLiteral RID_SVXBMP_POSITION = u"res/sc10223.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SIZE = u"res/sc10224.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SIGNET =
u"svx/res/signet_11x16.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SIGNET_BROKEN =
u"svx/res/caution_11x16.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SIGNET_NOTVALIDATED =
u"svx/res/notcertificate_16.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERBUTTON =
u"svx/res/slidezoombutton_10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERDECREASE =
u"svx/res/slidezoomout_10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERINCREASE =
u"svx/res/slidezoomin_10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DOC_MODIFIED_YES =
u"svx/res/doc_modified_yes_14.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DOC_MODIFIED_NO =
u"svx/res/doc_modified_no_14.png";
+inline constexpr OUStringLiteral RID_SVXBMP_DOC_MODIFIED_FEEDBACK =
u"svx/res/doc_modified_feedback.png";
+inline constexpr OUStringLiteral RID_SVXBMP_ZOOM_PAGE =
u"svx/res/zoom_page_statusbar.png";
-#define BMAP_GrafikEi "res/grafikei.png"
-#define SIP_SA_PAGESHADOW35X35
"svx/res/pageshadow35x35.png"
-#define SIP_SA_MARKERS "svx/res/markers.png"
-#define BMP_SVXOLEOBJ "res/oleobj.png"
-#define SIP_SA_CROP_MARKERS "svx/res/cropmarkers.png"
+inline constexpr OUStringLiteral BMAP_GrafikEi = u"res/grafikei.png";
+inline constexpr OUStringLiteral SIP_SA_PAGESHADOW35X35 =
u"svx/res/pageshadow35x35.png";
+inline constexpr OUStringLiteral SIP_SA_MARKERS = u"svx/res/markers.png";
+inline constexpr OUStringLiteral BMP_SVXOLEOBJ = u"res/oleobj.png";
+inline constexpr OUStringLiteral SIP_SA_CROP_MARKERS =
u"svx/res/cropmarkers.png";
#define BMP_MARKER_ANCHOR "svx/res/marker-anchor.png"
#define BMP_MARKER_ANCHOR_PRESSED
"svx/res/marker-anchor-pressed.png"
#define BMP_MARKER_CIRC7_1
"svx/res/marker-circ7-1.png"
@@ -260,33 +260,31 @@
/*
* Bitmaps for SvxFrameWindow
*/
-#define RID_SVXBMP_FRAME1 "svx/res/fr01.png"
-#define RID_SVXBMP_FRAME2 "svx/res/fr02.png"
-#define RID_SVXBMP_FRAME3 "svx/res/fr03.png"
-#define RID_SVXBMP_FRAME4 "svx/res/fr04.png"
-#define RID_SVXBMP_FRAME5 "svx/res/fr05.png"
-#define RID_SVXBMP_FRAME6 "svx/res/fr06.png"
-#define RID_SVXBMP_FRAME7 "svx/res/fr07.png"
-#define RID_SVXBMP_FRAME8 "svx/res/fr08.png"
-#define RID_SVXBMP_FRAME9 "svx/res/fr09.png"
-#define RID_SVXBMP_FRAME10 "svx/res/fr010.png"
-#define RID_SVXBMP_FRAME11 "svx/res/fr011.png"
-#define RID_SVXBMP_FRAME12 "svx/res/fr012.png"
-#define RID_SVXBMP_FRAME13 "svx/res/fr013.png"
-#define RID_SVXBMP_FRAME14 "svx/res/fr014.png"
-#define RID_SVXBMP_FRAME15 "svx/res/fr015.png"
-#define RID_SVXBMP_GRAF_RED "res/sc10865.png"
-#define RID_SVXBMP_GRAF_GREEN "res/sc10866.png"
-#define RID_SVXBMP_GRAF_BLUE "res/sc10867.png"
-#define RID_SVXBMP_GRAF_LUMINANCE "res/sc10863.png"
-#define RID_SVXBMP_GRAF_CONTRAST "res/sc10864.png"
-#define RID_SVXBMP_GRAF_GAMMA "res/sc10868.png"
-#define RID_SVXBMP_GRAF_TRANSPARENCE "res/sc10869.png"
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME1 = u"svx/res/fr01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME2 = u"svx/res/fr02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME3 = u"svx/res/fr03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME4 = u"svx/res/fr04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME5 = u"svx/res/fr05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME6 = u"svx/res/fr06.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME7 = u"svx/res/fr07.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME8 = u"svx/res/fr08.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME9 = u"svx/res/fr09.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME10 = u"svx/res/fr010.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME11 = u"svx/res/fr011.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME12 = u"svx/res/fr012.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME13 = u"svx/res/fr013.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME14 = u"svx/res/fr014.png";
+inline constexpr OUStringLiteral RID_SVXBMP_FRAME15 = u"svx/res/fr015.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_RED = u"res/sc10865.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_GREEN = u"res/sc10866.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_BLUE = u"res/sc10867.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_LUMINANCE =
u"res/sc10863.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_CONTRAST = u"res/sc10864.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_GAMMA = u"res/sc10868.png";
+inline constexpr OUStringLiteral RID_SVXBMP_GRAF_TRANSPARENCE =
u"res/sc10869.png";
-#define RID_UNODRAW_OBJECTS "svx/res/objects.png"
-#define RID_UNODRAW_OLE2 "svx/res/ole.png"
-#define RID_UNODRAW_GRAPHICS "svx/res/graphic.png"
-
-#endif
+inline constexpr OUStringLiteral RID_UNODRAW_OBJECTS = u"svx/res/objects.png";
+inline constexpr OUStringLiteral RID_UNODRAW_OLE2 = u"svx/res/ole.png";
+inline constexpr OUStringLiteral RID_UNODRAW_GRAPHICS = u"svx/res/graphic.png";
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h
index c6693c822cea..cd7f3e1281c7 100644
--- a/svx/inc/helpids.h
+++ b/svx/inc/helpids.h
@@ -19,41 +19,43 @@
#ifndef INCLUDED_SVX_INC_HELPIDS_H
#define INCLUDED_SVX_INC_HELPIDS_H
-#define HID_BMPMASK_CTL_QCOL_1
"SVX_HID_BMPMASK_CTL_QCOL_1"
-#define HID_COLOR_CTL_COLORS
"SVX_HID_COLOR_CTL_COLORS"
-#define HID_CTRL3D_HSCROLL
"SVX_HID_CTRL3D_HSCROLL"
-#define HID_CTRL3D_SWITCHER
"SVX_HID_CTRL3D_SWITCHER"
-#define HID_CTRL3D_VSCROLL
"SVX_HID_CTRL3D_VSCROLL"
-#define HID_CTRL_COLOR
"SVX_HID_CTRL_COLOR"
-#define HID_GALLERY_ICONVIEW
"SVX_HID_GALLERY_ICONVIEW"
-#define HID_GALLERY_LISTVIEW
"SVX_HID_GALLERY_LISTVIEW"
-#define HID_GALLERY_NEWTHEME
"SVX_HID_GALLERY_NEWTHEME"
-#define HID_GALLERY_THEMELIST
"SVX_HID_GALLERY_THEMELIST"
-#define HID_GALLERY_WINDOW
"SVX_HID_GALLERY_WINDOW"
-#define HID_POPUP_COLOR
"SVX_HID_POPUP_COLOR"
-#define HID_POPUP_COLOR_CTRL
"SVX_HID_POPUP_COLOR_CTRL"
-#define HID_POPUP_FRAME
"SVX_HID_POPUP_FRAME"
-#define HID_POPUP_LINE
"SVX_HID_POPUP_LINE"
-#define HID_POPUP_LINEEND
"SVX_HID_POPUP_LINEEND"
-#define HID_POPUP_LINEEND_CTRL
"SVX_HID_POPUP_LINEEND_CTRL"
-#define HID_STYLE_LISTBOX
"SVX_HID_STYLE_LISTBOX"
-#define HID_VALUESET_EXTRUSION_LIGHTING
"SVX_HID_VALUESET_EXTRUSION_LIGHTING"
-#define HID_UNDERLINE_BTN
"SVX_HID_UNDERLINE_BTN"
-#define HID_SPACING_MB_KERN
"SVX_HID_SPACING_MB_KERN"
+#include <rtl/string.hxx>
-#define HID_FORM_NAVIGATOR
"SVX_HID_FORM_NAVIGATOR"
-#define HID_FORM_NAVIGATOR_WIN
"SVX_HID_FORM_NAVIGATOR_WIN"
-#define HID_FIELD_SEL
"SVX_HID_FIELD_SEL"
-#define HID_FIELD_SEL_WIN
"SVX_HID_FIELD_SEL_WIN"
-#define HID_FILTER_NAVIGATOR
"SVX_HID_FILTER_NAVIGATOR"
-#define HID_FILTER_NAVIGATOR_WIN
"SVX_HID_FILTER_NAVIGATOR_WIN"
-#define HID_GRID_TRAVEL_FIRST
"SVX_HID_GRID_TRAVEL_FIRST"
-#define HID_GRID_TRAVEL_PREV
"SVX_HID_GRID_TRAVEL_PREV"
... etc. - the rest is truncated
