diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-19 15:19:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-19 18:39:32 +0200 |
commit | 35dac3d5d51cf58c3f49e039b8a67b129055f267 (patch) | |
tree | ea77a6166d94973c782436fb346a25b610a387e4 /svtools/source | |
parent | 4bb0afe359a92df09ad5b61b66bc4cb3562aca1e (diff) |
convert some #define to OUStringLiteral
Change-Id: I3d2ce76d30ec4f42495d27f1913c6718d2c5078f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114293
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/config/optionsdrawinglayer.cxx | 54 | ||||
-rw-r--r-- | svtools/source/config/slidesorterbaropt.cxx | 12 |
2 files changed, 33 insertions, 33 deletions
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index f975ee9fc8af..2f78f49e0104 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -74,43 +74,43 @@ using namespace ::com::sun::star::uno ; #define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT 70 -#define PROPERTYNAME_OVERLAYBUFFER OUString("OverlayBuffer" ) -#define PROPERTYNAME_PAINTBUFFER OUString("PaintBuffer" ) -#define PROPERTYNAME_STRIPE_COLOR_A OUString("StripeColorA" ) -#define PROPERTYNAME_STRIPE_COLOR_B OUString("StripeColorB" ) -#define PROPERTYNAME_STRIPE_LENGTH OUString("StripeLength" ) +constexpr OUStringLiteral PROPERTYNAME_OVERLAYBUFFER = u"OverlayBuffer"; +constexpr OUStringLiteral PROPERTYNAME_PAINTBUFFER = u"PaintBuffer"; +constexpr OUStringLiteral PROPERTYNAME_STRIPE_COLOR_A = u"StripeColorA"; +constexpr OUStringLiteral PROPERTYNAME_STRIPE_COLOR_B = u"StripeColorB"; +constexpr OUStringLiteral PROPERTYNAME_STRIPE_LENGTH = u"StripeLength"; // #i73602# -#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString("OverlayBuffer_Calc") -#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString("OverlayBuffer_Writer") -#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString("OverlayBuffer_DrawImpress") +constexpr OUStringLiteral PROPERTYNAME_OVERLAYBUFFER_CALC = u"OverlayBuffer_Calc"; +constexpr OUStringLiteral PROPERTYNAME_OVERLAYBUFFER_WRITER = u"OverlayBuffer_Writer"; +constexpr OUStringLiteral PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS = u"OverlayBuffer_DrawImpress"; // #i74769#, #i75172# -#define PROPERTYNAME_PAINTBUFFER_CALC OUString("PaintBuffer_Calc") -#define PROPERTYNAME_PAINTBUFFER_WRITER OUString("PaintBuffer_Writer") -#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString("PaintBuffer_DrawImpress") +constexpr OUStringLiteral PROPERTYNAME_PAINTBUFFER_CALC = u"PaintBuffer_Calc"; +constexpr OUStringLiteral PROPERTYNAME_PAINTBUFFER_WRITER = u"PaintBuffer_Writer"; +constexpr OUStringLiteral PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS = u"PaintBuffer_DrawImpress"; // #i4219# -#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString("MaximumPaperWidth") -#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString("MaximumPaperHeight") -#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString("MaximumPaperLeftMargin") -#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString("MaximumPaperRightMargin") -#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString("MaximumPaperTopMargin") -#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString("MaximumPaperBottomMargin") +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERWIDTH = u"MaximumPaperWidth"; +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERHEIGHT = u"MaximumPaperHeight"; +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN = u"MaximumPaperLeftMargin"; +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN = u"MaximumPaperRightMargin"; +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERTOPMARGIN = u"MaximumPaperTopMargin"; +constexpr OUStringLiteral PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN = u"MaximumPaperBottomMargin"; // primitives -#define PROPERTYNAME_ANTIALIASING OUString("AntiAliasing") -#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString("SnapHorVerLinesToDiscrete") -#define PROPERTYNAME_SOLIDDRAGCREATE OUString("SolidDragCreate") -#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString("RenderDecoratedTextDirect") -#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString("RenderSimpleTextDirect") -#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString("Quadratic3DRenderLimit") -#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString("QuadraticFormControlRenderLimit") +constexpr OUStringLiteral PROPERTYNAME_ANTIALIASING = u"AntiAliasing"; +constexpr OUStringLiteral PROPERTYNAME_SNAPHORVERLINESTODISCRETE = u"SnapHorVerLinesToDiscrete"; +constexpr OUStringLiteral PROPERTYNAME_SOLIDDRAGCREATE = u"SolidDragCreate"; +constexpr OUStringLiteral PROPERTYNAME_RENDERDECORATEDTEXTDIRECT = u"RenderDecoratedTextDirect"; +constexpr OUStringLiteral PROPERTYNAME_RENDERSIMPLETEXTDIRECT = u"RenderSimpleTextDirect"; +constexpr OUStringLiteral PROPERTYNAME_QUADRATIC3DRENDERLIMIT = u"Quadratic3DRenderLimit"; +constexpr OUStringLiteral PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT = u"QuadraticFormControlRenderLimit"; // #i97672# selection settings -#define PROPERTYNAME_TRANSPARENTSELECTION OUString("TransparentSelection") -#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString("TransparentSelectionPercent") -#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString("SelectionMaximumLuminancePercent") +constexpr OUStringLiteral PROPERTYNAME_TRANSPARENTSELECTION = u"TransparentSelection"; +constexpr OUStringLiteral PROPERTYNAME_TRANSPARENTSELECTIONPERCENT = u"TransparentSelectionPercent"; +constexpr OUStringLiteral PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT = u"SelectionMaximumLuminancePercent"; #define PROPERTYHANDLE_OVERLAYBUFFER 0 #define PROPERTYHANDLE_PAINTBUFFER 1 diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 770876048b42..a3e696ad6467 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -35,17 +35,17 @@ using namespace ::com::sun::star; #define ROOTNODE_SLIDESORTERBAR "Office.Impress/MultiPaneGUI/SlideSorterBar/Visible" -#define PROPERTYNAME_VISIBLE_IMPRESSVIEW OUString("ImpressView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_IMPRESSVIEW = u"ImpressView"; #define PROPERTYHANDLE_VISIBLE_IMPRESSVIEW 0 -#define PROPERTYNAME_VISIBLE_OUTLINEVIEW OUString("OutlineView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_OUTLINEVIEW = u"OutlineView"; #define PROPERTYHANDLE_VISIBLE_OUTLINEVIEW 1 -#define PROPERTYNAME_VISIBLE_NOTESVIEW OUString("NotesView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_NOTESVIEW = u"NotesView"; #define PROPERTYHANDLE_VISIBLE_NOTESVIEW 2 -#define PROPERTYNAME_VISIBLE_HANDOUTVIEW OUString("HandoutView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_HANDOUTVIEW = u"HandoutView"; #define PROPERTYHANDLE_VISIBLE_HANDOUTVIEW 3 -#define PROPERTYNAME_VISIBLE_SLIDESORTERVIEW OUString("SlideSorterView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_SLIDESORTERVIEW = u"SlideSorterView"; #define PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW 4 -#define PROPERTYNAME_VISIBLE_DRAWVIEW OUString("DrawView") +constexpr OUStringLiteral PROPERTYNAME_VISIBLE_DRAWVIEW = u"DrawView"; #define PROPERTYHANDLE_VISIBLE_DRAWVIEW 5 class SvtSlideSorterBarOptions_Impl : public ConfigItem |