diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-23 13:16:31 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-26 14:51:15 +0100 |
commit | a3d0091d185f39eddabf4d372ebe0ac3061dbb89 (patch) | |
tree | 4d70cedc274972ccc21b6b8e7105f042090cf5d6 /sd/source | |
parent | af791fb775e35c11ad01c42a7085dd121ab9c7a6 (diff) |
New loplugin:stringliteralvar
See the comment at the top of compilerplugins/clang/stringliteralvar.cxx for
details.
(Turned some affected variables in included files into inline variables, to
avoid GCC warnings about unused variables.)
Change-Id: Ie77219e6adfdaaceaa8b4e590b08971f2f04c83a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/PresentationFactory.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/unokywds.hxx | 99 | ||||
-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 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 2 |
7 files changed, 58 insertions, 57 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index bcd21c6e8074..85a37b6b7d1d 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2222,8 +2222,8 @@ OUString const & HtmlExport::getDocumentTitle() return mDocTitle; } -const char JS_NavigateAbs[] = - "function NavigateAbs( nPage )\r\n" +const OUStringLiteral JS_NavigateAbs = + u"function NavigateAbs( nPage )\r\n" "{\r\n" " frames[\"show\"].location.href = \"img\" + nPage + \".$EXT\";\r\n" " //frames[\"notes\"].location.href = \"note\" + nPage + \".$EXT\";\r\n" diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7384b8612fbb..cb1bcf5b88a0 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -86,7 +86,7 @@ private: //===== PresentationFactory =================================================== -const char gsPresentationViewURL[] = "private:resource/view/Presentation"; +const 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 6fa44746e00d..07ba9cd3e3ec 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -23,18 +23,18 @@ #include <sal/config.h> // SdUnoPseudoStyleFamily -inline const char sUNO_PseudoSheet_Background[] = "background"; +inline const OUStringLiteral sUNO_PseudoSheet_Background = u"background"; // SdLayer -inline const char sUNO_LayerName_background[] = "background"; -inline const char sUNO_LayerName_background_objects[] = "backgroundobjects"; -inline const char sUNO_LayerName_layout[] = "layout"; -inline const char sUNO_LayerName_controls[] = "controls"; -inline const char sUNO_LayerName_measurelines[] = "measurelines"; +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"; // services -inline const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties"; -inline const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground"; +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 const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject"; inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject"; @@ -58,53 +58,54 @@ inline const char16_t sUNO_Prop_InteropGrabBag[] = u"InteropGrabBag"; // view settings inline const char sUNO_View_ViewId[] = "ViewId"; -inline const char sUNO_View_SnapLinesDrawing[] = "SnapLinesDrawing"; -inline const char sUNO_View_SnapLinesNotes[] = "SnapLinesNotes"; -inline const char sUNO_View_SnapLinesHandout[] = "SnapLinesHandout"; -inline const char sUNO_View_RulerIsVisible[] = "RulerIsVisible"; -inline const char sUNO_View_PageKind[] = "PageKind"; -inline const char sUNO_View_SelectedPage[] = "SelectedPage"; -inline const char sUNO_View_IsLayerMode[] = "IsLayerMode"; -inline const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit"; -inline const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation"; -inline const char sUNO_View_SlidesPerRow[] = "SlidesPerRow"; -inline const char sUNO_View_EditMode[] = "EditMode"; +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 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 char sUNO_View_GridIsVisible[] = "GridIsVisible"; -inline const char sUNO_View_GridIsFront[] = "GridIsFront"; -inline const char sUNO_View_IsSnapToGrid[] = "IsSnapToGrid"; -inline const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins"; -inline const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines"; -inline const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame"; -inline const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints"; -inline const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible"; -inline const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles"; -inline const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle"; -inline const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints"; +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 + = u"EliminatePolyPointLimitAngle"; +inline const OUStringLiteral sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints"; inline const char sUNO_View_ActiveLayer[] = "ActiveLayer"; -inline const char sUNO_View_NoAttribs[] = "NoAttribs"; -inline const char sUNO_View_NoColors[] = "NoColors"; -inline const char sUNO_View_GridCoarseWidth[] = "GridCoarseWidth"; -inline const char sUNO_View_GridCoarseHeight[] = "GridCoarseHeight"; -inline const char sUNO_View_GridFineWidth[] = "GridFineWidth"; -inline const char sUNO_View_GridFineHeight[] = "GridFineHeight"; -inline const char sUNO_View_IsAngleSnapEnabled[] = "IsAngleSnapEnabled"; -inline const char sUNO_View_SnapAngle[] = "SnapAngle"; -inline const char sUNO_View_GridSnapWidthXNumerator[] = "GridSnapWidthXNumerator"; -inline const char sUNO_View_GridSnapWidthXDenominator[] = "GridSnapWidthXDenominator"; -inline const char sUNO_View_GridSnapWidthYNumerator[] = "GridSnapWidthYNumerator"; -inline const char sUNO_View_GridSnapWidthYDenominator[] = "GridSnapWidthYDenominator"; -inline const char sUNO_View_VisibleLayers[] = "VisibleLayers"; -inline const char sUNO_View_PrintableLayers[] = "PrintableLayers"; -inline const char sUNO_View_LockedLayers[] = "LockedLayers"; +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 const char sUNO_View_VisibleAreaTop[] = "VisibleAreaTop"; -inline const char sUNO_View_VisibleAreaLeft[] = "VisibleAreaLeft"; -inline const char sUNO_View_VisibleAreaWidth[] = "VisibleAreaWidth"; -inline const char sUNO_View_VisibleAreaHeight[] = "VisibleAreaHeight"; +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 const char sUNO_View_ZoomOnPage[] = "ZoomOnPage"; #endif diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 3e176707fd06..ca0fd8ae490b 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 char gsDefaultClickAction[] = "applyselect"; +const 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 d182a4cd7a9a..f3c881af253f 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 char aCurrentPagePropertyName[] = "CurrentPage"; -const char aEditModePropertyName[] = "IsMasterPageMode"; +const OUStringLiteral aCurrentPagePropertyName = u"CurrentPage"; +const OUStringLiteral aEditModePropertyName = u"IsMasterPageMode"; //===== EventMultiplexer ====================================================== diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 83a5e8f28967..697ea5d5910c 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 char ssServiceName[] = "com.sun.star.drawing.DrawingDocumentDrawView"; +const OUStringLiteral ssServiceName = u"com.sun.star.drawing.DrawingDocumentDrawView"; sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName) { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index b082556d17b6..4a4f09cd50e3 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -102,7 +102,7 @@ enum WID_PAGE } -char const sEmptyPageName[sizeof("page")] = "page"; +OUStringLiteral const sEmptyPageName = u"page"; // this function stores the property maps for draw pages in impress and draw static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind ) |