include/editeng/unotext.hxx | 36 +++++-----
include/oox/core/relations.hxx | 2
include/svx/unoshprp.hxx | 82 +++++++++++------------
sd/source/ui/unoidl/unoobj.cxx | 54 +++++++--------
sd/source/ui/unoidl/unopage.cxx | 96 ++++++++++++++--------------
sw/source/core/unocore/unomapproperties.hxx | 2
6 files changed, 136 insertions(+), 136 deletions(-)
New commits:
commit 002b0a9d5793e07609f953b9961b04bcab7a7e3f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 6 08:30:39 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 6 17:41:42 2023 +0200
loplugin:ostr: manual modifications
Change-Id: I06a76e82e330b0250ce8f2d3d00cbb257703ba4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157646
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index eab4961c1288..a8e2a335c82b 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -73,12 +73,12 @@ struct SfxItemPropertyMapEntry;
#define SVX_UNOEDIT_OUTLINER_PROPERTIES \
SVX_UNOEDIT_NUMBERING_PROPERTY, \
{ UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
- {u"NumberingStartValue", WID_NUMBERINGSTARTVALUE,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
- {u"ParaIsNumberingRestart", WID_PARAISNUMBERINGRESTART,
cppu::UnoType<bool>::get(), 0, 0 }
+ {u"NumberingStartValue"_ustr, WID_NUMBERINGSTARTVALUE,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
+ {u"ParaIsNumberingRestart"_ustr, WID_PARAISNUMBERINGRESTART,
cppu::UnoType<bool>::get(), 0, 0 }
#define SVX_UNOEDIT_CHAR_PROPERTIES \
{ UNO_NAME_EDIT_CHAR_HEIGHT, EE_CHAR_FONTHEIGHT,
cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
- { u"CharScaleWidth", EE_CHAR_FONTWIDTH,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
+ { u"CharScaleWidth"_ustr, EE_CHAR_FONTWIDTH,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
{ UNO_NAME_EDIT_CHAR_FONTNAME, EE_CHAR_FONTINFO,
::cppu::UnoType<OUString>::get(), 0, MID_FONT_FAMILY_NAME },\
{ UNO_NAME_EDIT_CHAR_FONTSTYLENAME,EE_CHAR_FONTINFO,
::cppu::UnoType<OUString>::get(), 0, MID_FONT_STYLE_NAME }, \
{ UNO_NAME_EDIT_CHAR_FONTFAMILY, EE_CHAR_FONTINFO,
::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_FAMILY }, \
@@ -99,21 +99,21 @@ struct SfxItemPropertyMapEntry;
{ UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT, EE_CHAR_BKGCOLOR,
::cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
{ UNO_NAME_EDIT_CHAR_ESCAPEMENT, EE_CHAR_ESCAPEMENT,
::cppu::UnoType<sal_Int16>::get(), 0, MID_ESC }, \
{ UNO_NAME_EDIT_CHAR_UNDERLINE, EE_CHAR_UNDERLINE,
::cppu::UnoType<sal_Int16>::get(), 0, MID_TL_STYLE }, \
- { u"CharUnderlineColor", EE_CHAR_UNDERLINE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \
- { u"CharUnderlineHasColor", EE_CHAR_UNDERLINE,
cppu::UnoType<bool>::get(), 0, MID_TL_HASCOLOR } , \
+ { u"CharUnderlineColor"_ustr, EE_CHAR_UNDERLINE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \
+ { u"CharUnderlineHasColor"_ustr, EE_CHAR_UNDERLINE,
cppu::UnoType<bool>::get(), 0, MID_TL_HASCOLOR } , \
{ UNO_NAME_EDIT_CHAR_OVERLINE, EE_CHAR_OVERLINE,
::cppu::UnoType<sal_Int16>::get(), 0, MID_TL_STYLE }, \
- { u"CharOverlineColor", EE_CHAR_OVERLINE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \
- { u"CharOverlineHasColor", EE_CHAR_OVERLINE,
cppu::UnoType<bool>::get(), 0, MID_TL_HASCOLOR } , \
+ { u"CharOverlineColor"_ustr, EE_CHAR_OVERLINE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \
+ { u"CharOverlineHasColor"_ustr, EE_CHAR_OVERLINE,
cppu::UnoType<bool>::get(), 0, MID_TL_HASCOLOR } , \
{ UNO_NAME_EDIT_CHAR_CROSSEDOUT, EE_CHAR_STRIKEOUT,
cppu::UnoType<bool>::get(), 0, MID_CROSSED_OUT }, \
{ UNO_NAME_EDIT_CHAR_STRIKEOUT, EE_CHAR_STRIKEOUT,
::cppu::UnoType<sal_Int16>::get(), 0, MID_CROSS_OUT}, \
{ UNO_NAME_EDIT_CHAR_CASEMAP, EE_CHAR_CASEMAP,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
{ UNO_NAME_EDIT_CHAR_SHADOWED, EE_CHAR_SHADOW,
cppu::UnoType<bool>::get(), 0, 0 }, \
- { u"CharContoured", EE_CHAR_OUTLINE,
cppu::UnoType<bool>::get(), 0, 0 }, \
- { u"CharEscapementHeight", EE_CHAR_ESCAPEMENT,
cppu::UnoType<sal_Int8>::get(), 0, MID_ESC_HEIGHT },\
- { u"CharAutoKerning",
EE_CHAR_PAIRKERNING,cppu::UnoType<bool>::get(), 0, 0 } , \
- { u"CharKerning", EE_CHAR_KERNING,
::cppu::UnoType<sal_Int16>::get() , 0, 0 }, \
- { u"CharWordMode", EE_CHAR_WLM,
cppu::UnoType<bool>::get(), 0, 0 }, \
- { u"CharEmphasis", EE_CHAR_EMPHASISMARK,
::cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS},\
+ { u"CharContoured"_ustr, EE_CHAR_OUTLINE,
cppu::UnoType<bool>::get(), 0, 0 }, \
+ { u"CharEscapementHeight"_ustr, EE_CHAR_ESCAPEMENT,
cppu::UnoType<sal_Int8>::get(), 0, MID_ESC_HEIGHT },\
+ { u"CharAutoKerning"_ustr,
EE_CHAR_PAIRKERNING,cppu::UnoType<bool>::get(), 0, 0 } , \
+ { u"CharKerning"_ustr, EE_CHAR_KERNING,
::cppu::UnoType<sal_Int16>::get() , 0, 0 }, \
+ { u"CharWordMode"_ustr, EE_CHAR_WLM,
cppu::UnoType<bool>::get(), 0, 0 }, \
+ { u"CharEmphasis"_ustr, EE_CHAR_EMPHASISMARK,
::cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS},\
{ UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN, EE_CHAR_FONTHEIGHT_CJK,
cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
{ UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN, EE_CHAR_FONTINFO_CJK,
::cppu::UnoType<OUString>::get(), 0, MID_FONT_FAMILY_NAME },\
{ UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN, EE_CHAR_FONTINFO_CJK,
::cppu::UnoType<OUString>::get(), 0, MID_FONT_STYLE_NAME }, \
@@ -132,8 +132,8 @@ struct SfxItemPropertyMapEntry;
{ UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX, EE_CHAR_ITALIC_CTL,
::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
{ UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX, EE_CHAR_WEIGHT_CTL,
cppu::UnoType<float>::get(), 0, MID_WEIGHT }, \
{ UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX, EE_CHAR_LANGUAGE_CTL,
::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
- { u"CharRelief", EE_CHAR_RELIEF,
::cppu::UnoType<sal_Int16>::get(), 0, MID_RELIEF }, \
- { u"CharInteropGrabBag", EE_CHAR_GRABBAG,
cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue >>::get(), 0, 0}
+ { u"CharRelief"_ustr, EE_CHAR_RELIEF,
::cppu::UnoType<sal_Int16>::get(), 0, MID_RELIEF }, \
+ { u"CharInteropGrabBag"_ustr, EE_CHAR_GRABBAG,
cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue >>::get(), 0, 0}
#define SVX_UNOEDIT_FONT_PROPERTIES \
@@ -143,8 +143,8 @@ struct SfxItemPropertyMapEntry;
{ UNO_NAME_EDIT_PARA_ADJUST, EE_PARA_JUST,
::cppu::UnoType<sal_Int16>::get(), 0, MID_PARA_ADJUST }, \
{ UNO_NAME_EDIT_PARA_BMARGIN, EE_PARA_ULSPACE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_LO_MARGIN,
PropertyMoreFlags::METRIC_ITEM }, \
{ UNO_NAME_EDIT_PARA_IS_HYPHEN, EE_PARA_HYPHENATE,
::cppu::UnoType<bool>::get(), 0, 0 }, \
- {u"ParaHyphenationNoCaps", EE_PARA_HYPHENATE_NO_CAPS,
::cppu::UnoType<bool>::get(), 0, 0 }, \
- {u"ParaHyphenationNoLastWord", EE_PARA_HYPHENATE_NO_LAST_WORD,
::cppu::UnoType<bool>::get(), 0, 0 }, \
+ {u"ParaHyphenationNoCaps"_ustr, EE_PARA_HYPHENATE_NO_CAPS,
::cppu::UnoType<bool>::get(), 0, 0 }, \
+ {u"ParaHyphenationNoLastWord"_ustr, EE_PARA_HYPHENATE_NO_LAST_WORD,
::cppu::UnoType<bool>::get(), 0, 0 }, \
{ UNO_NAME_EDIT_PARA_LASTLINEADJ, EE_PARA_JUST,
::cppu::UnoType<sal_Int16>::get(), 0, MID_LAST_LINE_ADJUST }, \
{ UNO_NAME_EDIT_PARA_LMARGIN, EE_PARA_LRSPACE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TXT_LMARGIN,
PropertyMoreFlags::METRIC_ITEM }, \
{ UNO_NAME_EDIT_PARA_LINESPACING, EE_PARA_SBL,
cppu::UnoType<css::style::LineSpacing>::get(), 0, CONVERT_TWIPS}, \
@@ -156,7 +156,7 @@ struct SfxItemPropertyMapEntry;
{ UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION,EE_PARA_HANGINGPUNCTUATION,
cppu::UnoType<bool>::get(), 0 ,0 }, \
{ UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE, EE_PARA_ASIANCJKSPACING,
cppu::UnoType<bool>::get(), 0 ,0 }, \
{ UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES, EE_PARA_FORBIDDENRULES,
cppu::UnoType<bool>::get(), 0 ,0 },\
- {u"WritingMode", EE_PARA_WRITINGDIR,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }
+ {u"WritingMode"_ustr, EE_PARA_WRITINGDIR,
::cppu::UnoType<sal_Int16>::get(), 0, 0 }
class SvxFieldItem;
class SvxFieldData;
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 7f0475705f8c..b8a6580648e2 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -34,7 +34,7 @@ namespace oox::core {
/** Expands to an OUString containing an 'officeDocument' transitional
relation type created
from the passed literal(!) ASCII(!) character array. */
#define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \
- ( u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/";
ascii )
+ ( u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/";
ascii ""_ustr )
/** Expands to an OUString containing an 'officeDocument' strict relation type
created
from the passed literal(!) ASCII(!) character array. */
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index aef31edf1e19..0dd723f08e77 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -202,26 +202,26 @@
// #FontWork#
#define FONTWORK_PROPERTIES \
- { u"FontWorkStyle", XATTR_FORMTXTSTYLE,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"FontWorkAdjust", XATTR_FORMTXTADJUST,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"FontWorkDistance", XATTR_FORMTXTDISTANCE,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"FontWorkStart", XATTR_FORMTXTSTART,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"FontWorkMirror", XATTR_FORMTXTMIRROR,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"FontWorkOutline", XATTR_FORMTXTOUTLINE,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"FontWorkShadow", XATTR_FORMTXTSHADOW,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"FontWorkShadowColor", XATTR_FORMTXTSHDWCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"FontWorkShadowOffsetX", XATTR_FORMTXTSHDWXVAL,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"FontWorkShadowOffsetY", XATTR_FORMTXTSHDWYVAL,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"FontWorkHideForm", XATTR_FORMTXTHIDEFORM,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"FontWorkShadowTransparence",XATTR_FORMTXTSHDWTRANSP,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { u"FontWorkStyle"_ustr, XATTR_FORMTXTSTYLE,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"FontWorkAdjust"_ustr, XATTR_FORMTXTADJUST,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"FontWorkDistance"_ustr, XATTR_FORMTXTDISTANCE,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { u"FontWorkStart"_ustr, XATTR_FORMTXTSTART,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { u"FontWorkMirror"_ustr, XATTR_FORMTXTMIRROR,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { u"FontWorkOutline"_ustr, XATTR_FORMTXTOUTLINE,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { u"FontWorkShadow"_ustr, XATTR_FORMTXTSHADOW,
/*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"FontWorkShadowColor"_ustr, XATTR_FORMTXTSHDWCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"FontWorkShadowOffsetX"_ustr, XATTR_FORMTXTSHDWXVAL,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { u"FontWorkShadowOffsetY"_ustr, XATTR_FORMTXTSHDWYVAL,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { u"FontWorkHideForm"_ustr, XATTR_FORMTXTHIDEFORM,
cppu::UnoType<bool>::get(), 0, 0}, \
+ { u"FontWorkShadowTransparence"_ustr,XATTR_FORMTXTSHDWTRANSP,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define GLOW_PROPERTIES \
- { u"GlowEffectRadius", SDRATTR_GLOW_RADIUS,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
- { u"GlowEffectColor", SDRATTR_GLOW_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { u"GlowEffectTransparency",
SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"GlowEffectRadius"_ustr, SDRATTR_GLOW_RADIUS,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { u"GlowEffectColor"_ustr, SDRATTR_GLOW_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"GlowEffectTransparency"_ustr,
SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(), 0, 0 },
#define SOFTEDGE_PROPERTIES \
- { u"SoftEdgeRadius", SDRATTR_SOFTEDGE_RADIUS,
cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
+ { u"SoftEdgeRadius"_ustr, SDRATTR_SOFTEDGE_RADIUS,
cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define SHADOW_PROPERTIES \
{ UNO_NAME_SHADOW, SDRATTR_SHADOW,
cppu::UnoType<bool>::get(), 0, 0}, \
@@ -250,14 +250,14 @@
#define LINE_PROPERTIES \
{ 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}, \
+ { u"LineDashName"_ustr, XATTR_LINEDASH,
::cppu::UnoType<OUString>::get() , 0, MID_NAME}, \
LINE_PROPERTIES_DEFAULTS
#define LINE_PROPERTIES_START_END \
{ 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"LineEndName"_ustr, XATTR_LINEEND,
::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
{ 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 },
+ { u"LineStartName"_ustr, XATTR_LINESTART,
::cppu::UnoType<OUString>::get(), 0, MID_NAME },
#define FILL_PROPERTIES_BMP \
{ UNO_NAME_FILLBMP_LOGICAL_SIZE, XATTR_FILLBMP_SIZELOG,
cppu::UnoType<bool>::get() , 0, 0}, \
@@ -330,7 +330,7 @@
{ 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}, \
{ UNO_NAME_TEXT_CLIPVERTOVERFLOW, SDRATTR_TEXT_CLIPVERTOVERFLOW,
cppu::UnoType<bool>::get(), 0, 0}, \
- { u"TextColumns", OWN_ATTR_TEXTCOLUMNS,
cppu::UnoType<css::text::XTextColumns>::get(), 0, 0 }, \
+ { u"TextColumns"_ustr, OWN_ATTR_TEXTCOLUMNS,
cppu::UnoType<css::text::XTextColumns>::get(), 0, 0 }, \
SVX_UNOEDIT_CHAR_PROPERTIES, \
SVX_UNOEDIT_PARA_PROPERTIES,
@@ -341,13 +341,13 @@
// { "HasLevels", OWN_ATTR_HASLEVELS,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0},
#define MISC_OBJ_PROPERTIES_NO_SHEAR \
- { u"Transformation", OWN_ATTR_TRANSFORMATION,
cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \
+ { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION,
cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 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"IsFontwork"_ustr, OWN_ATTR_ISFONTWORK,
cppu::UnoType<bool>::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 \
@@ -362,17 +362,17 @@
{ 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"Visible"_ustr, SDRATTR_OBJVISIBLE ,
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<double>::get(), 0, 0}, \
+ { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
+ { u"UINamePlural"_ustr, OWN_ATTR_UINAME_PLURAL ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
+ { u"TextFitToSizeScale"_ustr, OWN_ATTR_TEXTFITTOSIZESCALE,
::cppu::UnoType<double>::get(), 0, 0}, \
/* #i68101# */ \
{ 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}, \
- { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE,
::cppu::UnoType<bool>::get(), 0, 0}, \
+ { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE,
::cppu::UnoType<bool>::get(), 0, 0}, \
{ UNO_NAME_HYPERLINK, OWN_ATTR_HYPERLINK,
::cppu::UnoType<OUString>::get(), 0, 0}, \
- { u"WritingMode", SDRATTR_WRITINGMODE2, ::cppu::UnoType<sal_Int16>::get(),
0, 0},
+ { u"WritingMode"_ustr, SDRATTR_WRITINGMODE2,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define LINKTARGET_PROPERTIES \
{ UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME ,
::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY,
0}, \
@@ -391,17 +391,17 @@
{ 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}, \
- { u"EndShape", OWN_ATTR_EDGE_END_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
- { u"EndPosition", OWN_ATTR_EDGE_END_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},\
- { u"EndGluePointIndex", OWN_ATTR_GLUEID_TAIL,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"StartShape"_ustr, OWN_ATTR_EDGE_START_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { u"StartGluePointIndex"_ustr, OWN_ATTR_GLUEID_HEAD,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { u"StartPosition"_ustr, OWN_ATTR_EDGE_START_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0}, \
+ { u"EndShape"_ustr, OWN_ATTR_EDGE_END_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { u"EndPosition"_ustr, OWN_ATTR_EDGE_END_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},\
+ { u"EndGluePointIndex"_ustr, OWN_ATTR_GLUEID_TAIL,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
\
- { u"EdgeStartConnection", OWN_ATTR_EDGE_START_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
- { u"EdgeStartPoint", OWN_ATTR_EDGE_START_POS,
::cppu::UnoType<css::awt::Point>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
- { 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"EdgeStartConnection"_ustr, OWN_ATTR_EDGE_START_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { u"EdgeStartPoint"_ustr, OWN_ATTR_EDGE_START_POS,
::cppu::UnoType<css::awt::Point>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
+ { u"EdgeEndConnection"_ustr, OWN_ATTR_EDGE_END_OBJ,
cppu::UnoType<css::drawing::XShape>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { u"EdgeEndPoint"_ustr, OWN_ATTR_EDGE_END_POS,
::cppu::UnoType<css::awt::Point>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
\
{ UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,
::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
@@ -425,13 +425,13 @@
{ 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},
+ { u"MeasureDecimalPlaces"_ustr, SDRATTR_MEASUREDECIMALPLACES,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define SPECIAL_DIMENSIONING_PROPERTIES \
SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
- { u"StartPosition", OWN_ATTR_MEASURE_START_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},\
- { u"EndPosition", OWN_ATTR_MEASURE_END_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},
+ { u"StartPosition"_ustr, OWN_ATTR_MEASURE_START_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},\
+ { u"EndPosition"_ustr, OWN_ATTR_MEASURE_END_POS,
::cppu::UnoType<css::awt::Point>::get(), 0, 0},
#define SPECIAL_CIRCLE_PROPERTIES \
{ UNO_NAME_CIRCENDANGLE, SDRATTR_CIRCENDANGLE,
::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 3994b9f63f60..93b46db9d798 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -105,29 +105,29 @@ using ::com::sun::star::drawing::XShape;
#define WID_LEGACYFRAGMENT 25
#define IMPRESS_MAP_ENTRIES \
- { u"" UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT,
cppu::UnoType<drawing::XShape>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH,
cppu::UnoType<drawing::XShape>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK,
cppu::UnoType<OUString>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_DIMCOLOR, WID_DIMCOLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_DIMHIDE, WID_DIMHIDE,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_DIMPREV, WID_DIMPREV,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_EFFECT, WID_EFFECT,
cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_ISPRESOBJ, WID_ISPRESOBJ,
cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
- { u"" UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION,
cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_PLAYFULL, WID_PLAYFULL,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_PRESORDER, WID_PRESORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_STYLE, WID_STYLE,
cppu::UnoType<style::XStyle>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0},\
- { u"" UNO_NAME_OBJ_SOUNDFILE, WID_SOUNDFILE,
cppu::UnoType<OUString>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_SOUNDON, WID_SOUNDON,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_SPEED, WID_SPEED,
cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_TEXTEFFECT, WID_TEXTEFFECT,
cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_BLUESCREEN, WID_BLUESCREEN,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_VERB, WID_VERB,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"IsAnimation", WID_ISANIMATION,
cppu::UnoType<bool>::get(), 0, 0},\
- { u"NavigationOrder", WID_NAVORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { u"PlaceholderText", WID_PLACEHOLDERTEXT,
cppu::UnoType<OUString>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_LEGACYFRAGMENT ""_ustr,WID_LEGACYFRAGMENT,
cppu::UnoType<drawing::XShape>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_ANIMATIONPATH ""_ustr, WID_ANIMPATH,
cppu::UnoType<drawing::XShape>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_BOOKMARK ""_ustr, WID_BOOKMARK,
cppu::UnoType<OUString>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_DIMCOLOR ""_ustr, WID_DIMCOLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_DIMHIDE ""_ustr, WID_DIMHIDE,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_DIMPREV ""_ustr, WID_DIMPREV,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_EFFECT ""_ustr, WID_EFFECT,
cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_ISEMPTYPRESOBJ ""_ustr,WID_ISEMPTYPRESOBJ,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_ISPRESOBJ ""_ustr, WID_ISPRESOBJ,
cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
+ { u"" UNO_NAME_OBJ_MASTERDEPENDENT ""_ustr,WID_MASTERDEPEND,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_CLICKACTION ""_ustr, WID_CLICKACTION,
cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_PLAYFULL ""_ustr, WID_PLAYFULL,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_PRESORDER ""_ustr, WID_PRESORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_STYLE ""_ustr, WID_STYLE,
cppu::UnoType<style::XStyle>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0},\
+ { u"" UNO_NAME_OBJ_SOUNDFILE ""_ustr, WID_SOUNDFILE,
cppu::UnoType<OUString>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_SOUNDON ""_ustr, WID_SOUNDON,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_SPEED ""_ustr, WID_SPEED,
cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_TEXTEFFECT ""_ustr, WID_TEXTEFFECT,
cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_BLUESCREEN ""_ustr, WID_BLUESCREEN,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_VERB ""_ustr, WID_VERB,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"IsAnimation"_ustr, WID_ISANIMATION,
cppu::UnoType<bool>::get(), 0, 0},\
+ { u"NavigationOrder"_ustr, WID_NAVORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"PlaceholderText"_ustr, WID_PLACEHOLDERTEXT,
cppu::UnoType<OUString>::get(), 0, 0},\
static o3tl::span<const SfxItemPropertyMapEntry>
lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
{
@@ -149,10 +149,10 @@ using ::com::sun::star::drawing::XShape;
}
#define DRAW_MAP_ENTRIES\
- { u"" UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK,
cppu::UnoType<OUString>::get(), 0, 0},\
- { u"" UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION,
cppu::UnoType<presentation::ClickAction>::get(),0, 0},\
- { u"" UNO_NAME_OBJ_STYLE, WID_STYLE,
cppu::UnoType<style::XStyle>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0},\
- { u"NavigationOrder", WID_NAVORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_BOOKMARK ""_ustr, WID_BOOKMARK,
cppu::UnoType<OUString>::get(), 0, 0},\
+ { u"" UNO_NAME_OBJ_CLICKACTION ""_ustr, WID_CLICKACTION,
cppu::UnoType<presentation::ClickAction>::get(),0, 0},\
+ { u"" UNO_NAME_OBJ_STYLE ""_ustr, WID_STYLE,
cppu::UnoType<style::XStyle>::get(),
css::beans::PropertyAttribute::MAYBEVOID, 0},\
+ { u"NavigationOrder"_ustr, WID_NAVORDER,
cppu::UnoType<sal_Int32>::get(), 0, 0},\
static o3tl::span<const SfxItemPropertyMapEntry>
lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
{
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index a92e381bd154..6af81c77aaa5 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -115,47 +115,47 @@ static const SvxItemPropertySet*
ImplGetDrawPagePropertySet( bool bImpress, Page
{
static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
{
- { u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK,
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::MAYBEVOID,0},
- { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_CHANGE, WID_PAGE_CHANGE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_DURATION, WID_PAGE_DURATION,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_EFFECT, WID_PAGE_EFFECT,
::cppu::UnoType<presentation::FadeEffect>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_BACKGROUND ""_ustr, WID_PAGE_BACK,
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::MAYBEVOID,0},
+ { u"" UNO_NAME_PAGE_BOTTOM ""_ustr, WID_PAGE_BOTTOM,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_LEFT ""_ustr, WID_PAGE_LEFT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_RIGHT ""_ustr, WID_PAGE_RIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_TOP ""_ustr, WID_PAGE_TOP,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_CHANGE ""_ustr, WID_PAGE_CHANGE,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_DURATION ""_ustr, WID_PAGE_DURATION,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_EFFECT ""_ustr, WID_PAGE_EFFECT,
::cppu::UnoType<presentation::FadeEffect>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_HEIGHT ""_ustr, WID_PAGE_HEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_LAYOUT ""_ustr, WID_PAGE_LAYOUT,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP,
cppu::UnoType<awt::XBitmap>::get(),
beans::PropertyAttribute::READONLY, 0},
{ UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME,
::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::READONLY, 0},
- { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER,
::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::READONLY, 0},
- { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT,
::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
- { u"" UNO_NAME_PAGE_SPEED, WID_PAGE_SPEED,
::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
- { u"" UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
- { u"" UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
- { u"" UNO_NAME_PAGE_VISIBLE, WID_PAGE_VISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
- { u"" UNO_NAME_OBJ_SOUNDFILE, WID_PAGE_SOUNDFILE,
cppu::UnoType<Any>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_NUMBER ""_ustr, WID_PAGE_NUMBER,
::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::READONLY, 0},
+ { u"" UNO_NAME_PAGE_ORIENTATION ""_ustr, WID_PAGE_ORIENT,
::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
+ { u"" UNO_NAME_PAGE_SPEED ""_ustr, WID_PAGE_SPEED,
::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_WIDTH ""_ustr, WID_PAGE_WIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_PREVIEW ""_ustr, WID_PAGE_PREVIEW,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { u"" UNO_NAME_PAGE_PREVIEWBITMAP ""_ustr, WID_PAGE_PREVIEWBITMAP,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { u"" UNO_NAME_PAGE_PREVIEWMETAFILE ""_ustr,
WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+ { u"" UNO_NAME_PAGE_VISIBLE ""_ustr, WID_PAGE_VISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"" UNO_NAME_OBJ_SOUNDFILE ""_ustr, WID_PAGE_SOUNDFILE,
cppu::UnoType<Any>::get(), 0, 0},
{ sUNO_Prop_IsBackgroundVisible, WID_PAGE_BACKVIS,
cppu::UnoType<bool>::get(), 0, 0},
{ sUNO_Prop_IsBackgroundObjectsVisible, WID_PAGE_BACKOBJVIS,
cppu::UnoType<bool>::get(), 0, 0},
{ sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS,
cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK,
::cppu::UnoType<OUString>::get(), 0, 0},
- { u"HighResDuration", WID_PAGE_HIGHRESDURATION,
::cppu::UnoType<double>::get(), 0, 0},
- { u"IsBackgroundDark" , WID_PAGE_ISDARK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::READONLY, 0},
- { u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
- { u"FooterText", WID_PAGE_FOOTERTEXT,
::cppu::UnoType<OUString>::get(), 0, 0},
- { u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
- { u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
- { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED,
cppu::UnoType<bool>::get(), 0, 0},
- { u"DateTimeText", WID_PAGE_DATETIMETEXT,
::cppu::UnoType<OUString>::get(), 0, 0},
- { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"TransitionType", WID_TRANSITION_TYPE,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
- { u"TransitionSubtype", WID_TRANSITION_SUBTYPE,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
- { u"TransitionDirection", WID_TRANSITION_DIRECTION,
::cppu::UnoType<sal_Bool>::get(), 0, 0},
- { u"TransitionFadeColor", WID_TRANSITION_FADE_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
- { u"" UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION,
::cppu::UnoType<double>::get(), 0, 0},
- { u"LoopSound", WID_LOOP_SOUND,
cppu::UnoType<bool>::get(), 0, 0},
- { u"NavigationOrder", WID_NAVORDER,
cppu::UnoType<css::container::XIndexAccess>::get(),0, 0},
+ { u"HighResDuration"_ustr, WID_PAGE_HIGHRESDURATION,
::cppu::UnoType<double>::get(), 0, 0},
+ { u"IsBackgroundDark"_ustr , WID_PAGE_ISDARK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::READONLY, 0},
+ { u"IsFooterVisible"_ustr, WID_PAGE_FOOTERVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"FooterText"_ustr, WID_PAGE_FOOTERTEXT,
::cppu::UnoType<OUString>::get(), 0, 0},
+ { u"IsPageNumberVisible"_ustr, WID_PAGE_PAGENUMBERVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"IsDateTimeVisible"_ustr, WID_PAGE_DATETIMEVISIBLE,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"IsDateTimeFixed"_ustr, WID_PAGE_DATETIMEFIXED,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"DateTimeText"_ustr, WID_PAGE_DATETIMETEXT,
::cppu::UnoType<OUString>::get(), 0, 0},
+ { u"DateTimeFormat"_ustr, WID_PAGE_DATETIMEFORMAT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"TransitionType"_ustr, WID_TRANSITION_TYPE,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { u"TransitionSubtype"_ustr, WID_TRANSITION_SUBTYPE,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { u"TransitionDirection"_ustr, WID_TRANSITION_DIRECTION,
::cppu::UnoType<sal_Bool>::get(), 0, 0},
+ { u"TransitionFadeColor"_ustr, WID_TRANSITION_FADE_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { u"" UNO_NAME_PAGE_TRANSITION_DURATION ""_ustr,
WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0},
+ { u"LoopSound"_ustr, WID_LOOP_SOUND,
cppu::UnoType<bool>::get(), 0, 0},
+ { u"NavigationOrder"_ustr, WID_NAVORDER,
cppu::UnoType<css::container::XIndexAccess>::get(),0, 0},
};
#define DRAW_PAGE_NOTES_PROPERTIES \
@@ -195,23 +195,23 @@ static const SvxItemPropertySet*
ImplGetDrawPagePropertySet( bool bImpress, Page
};
#define GRAPHIC_PAGE_PROPERTIES \
- { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
- { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
- { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
- { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
- { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_BOTTOM ""_ustr, WID_PAGE_BOTTOM,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_LEFT ""_ustr, WID_PAGE_LEFT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_RIGHT ""_ustr, WID_PAGE_RIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_TOP ""_ustr, WID_PAGE_TOP,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_HEIGHT ""_ustr, WID_PAGE_HEIGHT,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
{ UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP,
cppu::UnoType<awt::XBitmap>::get(),
beans::PropertyAttribute::READONLY, 0},
\
{ UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME,
::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::READONLY, 0},
\
- { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER,
::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::READONLY, 0},
\
- { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT,
::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
\
- { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
- { u"" UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
- { u"" UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
- { u"" UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
+ { u"" UNO_NAME_PAGE_NUMBER ""_ustr, WID_PAGE_NUMBER,
::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::READONLY, 0},
\
+ { u"" UNO_NAME_PAGE_ORIENTATION ""_ustr, WID_PAGE_ORIENT,
::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
\
+ { u"" UNO_NAME_PAGE_WIDTH ""_ustr, WID_PAGE_WIDTH,
::cppu::UnoType<sal_Int32>::get(), 0, 0},
\
+ { u"" UNO_NAME_PAGE_PREVIEW ""_ustr, WID_PAGE_PREVIEW,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0}, \
+ { u"" UNO_NAME_PAGE_PREVIEWBITMAP ""_ustr, WID_PAGE_PREVIEWBITMAP,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
+ { u"" UNO_NAME_PAGE_PREVIEWMETAFILE ""_ustr, WID_PAGE_PREVIEWMETAFILE,
cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
{ sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS,
cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
\
{ sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK,
::cppu::UnoType<OUString>::get(), 0, 0},
\
- { u"IsBackgroundDark", WID_PAGE_ISDARK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::READONLY, 0},
\
- { u"NavigationOrder", WID_NAVORDER,
cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}
+ { u"IsBackgroundDark"_ustr, WID_PAGE_ISDARK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::READONLY, 0},
\
+ { u"NavigationOrder"_ustr, WID_NAVORDER,
cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}
static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
{
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index 20f2f365651a..323aa3b9ce46 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -358,7 +358,7 @@
{ UNO_NAME_LAYOUT_SIZE, WID_LAYOUT_SIZE,
cppu::UnoType<css::awt::Size>::get(), PropertyAttribute::MAYBEVOID |
PropertyAttribute::READONLY, 0 }, \
{ UNO_NAME_LINE_STYLE, RES_BOX,
cppu::UnoType<css::drawing::LineStyle>::get(), 0, LINE_STYLE }, \
{ UNO_NAME_LINE_WIDTH, RES_BOX, cppu::UnoType<sal_Int32>::get(), 0,
LINE_WIDTH |CONVERT_TWIPS }, \
- { u"Decorative", RES_DECORATIVE, cppu::UnoType<bool>::get(),
PROPERTY_NONE, 0 }, \
+ { u"Decorative"_ustr, RES_DECORATIVE, cppu::UnoType<bool>::get(),
PROPERTY_NONE, 0 }, \
{ UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST,
cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
#define COMMON_TEXT_CONTENT_PROPERTIES \
