diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/framework/factories/PresentationFactory.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/unokywds.hxx | 101 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 2 |
5 files changed, 57 insertions, 54 deletions
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index cb1bcf5b88a0..44d46ded8ab7 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -86,7 +86,7 @@ private: //===== PresentationFactory =================================================== -const OUStringLiteral gsPresentationViewURL = u"private:resource/view/Presentation"; +constexpr OUStringLiteral gsPresentationViewURL = u"private:resource/view/Presentation"; PresentationFactory::PresentationFactory ( const Reference<frame::XController>& rxController) diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index 07ba9cd3e3ec..63b5553abc9f 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -23,18 +23,20 @@ #include <sal/config.h> // SdUnoPseudoStyleFamily -inline const OUStringLiteral sUNO_PseudoSheet_Background = u"background"; +inline constexpr OUStringLiteral sUNO_PseudoSheet_Background = u"background"; // SdLayer -inline const OUStringLiteral sUNO_LayerName_background = u"background"; -inline const OUStringLiteral sUNO_LayerName_background_objects = u"backgroundobjects"; -inline const OUStringLiteral sUNO_LayerName_layout = u"layout"; -inline const OUStringLiteral sUNO_LayerName_controls = u"controls"; -inline const OUStringLiteral sUNO_LayerName_measurelines = u"measurelines"; +inline constexpr OUStringLiteral sUNO_LayerName_background = u"background"; +inline constexpr OUStringLiteral sUNO_LayerName_background_objects = u"backgroundobjects"; +inline constexpr OUStringLiteral sUNO_LayerName_layout = u"layout"; +inline constexpr OUStringLiteral sUNO_LayerName_controls = u"controls"; +inline constexpr OUStringLiteral sUNO_LayerName_measurelines = u"measurelines"; // services -inline const OUStringLiteral sUNO_Service_FillProperties = u"com.sun.star.drawing.FillProperties"; -inline const OUStringLiteral sUNO_Service_PageBackground = u"com.sun.star.drawing.PageBackground"; +inline constexpr OUStringLiteral sUNO_Service_FillProperties + = u"com.sun.star.drawing.FillProperties"; +inline constexpr OUStringLiteral sUNO_Service_PageBackground + = u"com.sun.star.drawing.PageBackground"; inline const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject"; inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject"; @@ -58,54 +60,55 @@ inline const char16_t sUNO_Prop_InteropGrabBag[] = u"InteropGrabBag"; // view settings inline const char sUNO_View_ViewId[] = "ViewId"; -inline const OUStringLiteral sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing"; -inline const OUStringLiteral sUNO_View_SnapLinesNotes = u"SnapLinesNotes"; -inline const OUStringLiteral sUNO_View_SnapLinesHandout = u"SnapLinesHandout"; -inline const OUStringLiteral sUNO_View_RulerIsVisible = u"RulerIsVisible"; -inline const OUStringLiteral sUNO_View_PageKind = u"PageKind"; -inline const OUStringLiteral sUNO_View_SelectedPage = u"SelectedPage"; -inline const OUStringLiteral sUNO_View_IsLayerMode = u"IsLayerMode"; -inline const OUStringLiteral sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit"; -inline const OUStringLiteral sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation"; -inline const OUStringLiteral sUNO_View_SlidesPerRow = u"SlidesPerRow"; -inline const OUStringLiteral sUNO_View_EditMode = u"EditMode"; +inline constexpr OUStringLiteral sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing"; +inline constexpr OUStringLiteral sUNO_View_SnapLinesNotes = u"SnapLinesNotes"; +inline constexpr OUStringLiteral sUNO_View_SnapLinesHandout = u"SnapLinesHandout"; +inline constexpr OUStringLiteral sUNO_View_RulerIsVisible = u"RulerIsVisible"; +inline constexpr OUStringLiteral sUNO_View_PageKind = u"PageKind"; +inline constexpr OUStringLiteral sUNO_View_SelectedPage = u"SelectedPage"; +inline constexpr OUStringLiteral sUNO_View_IsLayerMode = u"IsLayerMode"; +inline constexpr OUStringLiteral sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit"; +inline constexpr OUStringLiteral sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation"; +inline constexpr OUStringLiteral sUNO_View_SlidesPerRow = u"SlidesPerRow"; +inline constexpr OUStringLiteral sUNO_View_EditMode = u"EditMode"; inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated // inline const char sUNO_View_EditModeNotes[] = "EditModeNotes"; // inline const char sUNO_View_EditModeHandout[] = "EditModeHandout"; -inline const OUStringLiteral sUNO_View_GridIsVisible = u"GridIsVisible"; -inline const OUStringLiteral sUNO_View_GridIsFront = u"GridIsFront"; -inline const OUStringLiteral sUNO_View_IsSnapToGrid = u"IsSnapToGrid"; -inline const OUStringLiteral sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins"; -inline const OUStringLiteral sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines"; -inline const OUStringLiteral sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame"; -inline const OUStringLiteral sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints"; -inline const OUStringLiteral sUNO_View_IsPlusHandlesAlwaysVisible = u"IsPlusHandlesAlwaysVisible"; -inline const OUStringLiteral sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles"; -inline const OUStringLiteral sUNO_View_EliminatePolyPointLimitAngle +inline constexpr OUStringLiteral sUNO_View_GridIsVisible = u"GridIsVisible"; +inline constexpr OUStringLiteral sUNO_View_GridIsFront = u"GridIsFront"; +inline constexpr OUStringLiteral sUNO_View_IsSnapToGrid = u"IsSnapToGrid"; +inline constexpr OUStringLiteral sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins"; +inline constexpr OUStringLiteral sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines"; +inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame"; +inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints"; +inline constexpr OUStringLiteral sUNO_View_IsPlusHandlesAlwaysVisible + = u"IsPlusHandlesAlwaysVisible"; +inline constexpr OUStringLiteral sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles"; +inline constexpr OUStringLiteral sUNO_View_EliminatePolyPointLimitAngle = u"EliminatePolyPointLimitAngle"; -inline const OUStringLiteral sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints"; +inline constexpr OUStringLiteral sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints"; inline const char sUNO_View_ActiveLayer[] = "ActiveLayer"; -inline const OUStringLiteral sUNO_View_NoAttribs = u"NoAttribs"; -inline const OUStringLiteral sUNO_View_NoColors = u"NoColors"; -inline const OUStringLiteral sUNO_View_GridCoarseWidth = u"GridCoarseWidth"; -inline const OUStringLiteral sUNO_View_GridCoarseHeight = u"GridCoarseHeight"; -inline const OUStringLiteral sUNO_View_GridFineWidth = u"GridFineWidth"; -inline const OUStringLiteral sUNO_View_GridFineHeight = u"GridFineHeight"; -inline const OUStringLiteral sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled"; -inline const OUStringLiteral sUNO_View_SnapAngle = u"SnapAngle"; -inline const OUStringLiteral sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator"; -inline const OUStringLiteral sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator"; -inline const OUStringLiteral sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator"; -inline const OUStringLiteral sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator"; -inline const OUStringLiteral sUNO_View_VisibleLayers = u"VisibleLayers"; -inline const OUStringLiteral sUNO_View_PrintableLayers = u"PrintableLayers"; -inline const OUStringLiteral sUNO_View_LockedLayers = u"LockedLayers"; +inline constexpr OUStringLiteral sUNO_View_NoAttribs = u"NoAttribs"; +inline constexpr OUStringLiteral sUNO_View_NoColors = u"NoColors"; +inline constexpr OUStringLiteral sUNO_View_GridCoarseWidth = u"GridCoarseWidth"; +inline constexpr OUStringLiteral sUNO_View_GridCoarseHeight = u"GridCoarseHeight"; +inline constexpr OUStringLiteral sUNO_View_GridFineWidth = u"GridFineWidth"; +inline constexpr OUStringLiteral sUNO_View_GridFineHeight = u"GridFineHeight"; +inline constexpr OUStringLiteral sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled"; +inline constexpr OUStringLiteral sUNO_View_SnapAngle = u"SnapAngle"; +inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator"; +inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator"; +inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator"; +inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator"; +inline constexpr OUStringLiteral sUNO_View_VisibleLayers = u"VisibleLayers"; +inline constexpr OUStringLiteral sUNO_View_PrintableLayers = u"PrintableLayers"; +inline constexpr OUStringLiteral sUNO_View_LockedLayers = u"LockedLayers"; -inline const OUStringLiteral sUNO_View_VisibleAreaTop = u"VisibleAreaTop"; -inline const OUStringLiteral sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft"; -inline const OUStringLiteral sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth"; -inline const OUStringLiteral sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight"; +inline constexpr OUStringLiteral sUNO_View_VisibleAreaTop = u"VisibleAreaTop"; +inline constexpr OUStringLiteral sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft"; +inline constexpr OUStringLiteral sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth"; +inline constexpr OUStringLiteral sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight"; inline const char sUNO_View_ZoomOnPage[] = "ZoomOnPage"; #endif diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index ca0fd8ae490b..bbd1e862e1d5 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -50,7 +50,7 @@ namespace sd::sidebar { /** menu entry that is executed as default action when the left mouse button is clicked over a master page. */ -const OStringLiteral gsDefaultClickAction = "applyselect"; +constexpr OStringLiteral gsDefaultClickAction = "applyselect"; MasterPagesSelector::MasterPagesSelector ( vcl::Window* pParent, diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index f3c881af253f..1c86d4c644c0 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -139,8 +139,8 @@ private: DECL_LINK(SlideSorterSelectionChangeListener, LinkParamNone*, void); }; -const OUStringLiteral aCurrentPagePropertyName = u"CurrentPage"; -const OUStringLiteral aEditModePropertyName = u"IsMasterPageMode"; +constexpr OUStringLiteral aCurrentPagePropertyName = u"CurrentPage"; +constexpr OUStringLiteral aEditModePropertyName = u"IsMasterPageMode"; //===== EventMultiplexer ====================================================== diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 697ea5d5910c..a82460b7fb7c 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -203,7 +203,7 @@ OUString SAL_CALL DrawController::getImplementationName( ) return "DrawController" ; } -const OUStringLiteral ssServiceName = u"com.sun.star.drawing.DrawingDocumentDrawView"; +constexpr OUStringLiteral ssServiceName = u"com.sun.star.drawing.DrawingDocumentDrawView"; sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName) { |