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>

17 files changed, 80 insertions, 80 deletions

diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx
index 938e44f9ca21..8220234c2ea5 100644
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-char const DATA_DIRECTORY[] = "/svx/qa/unit/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/svx/qa/unit/data/";
 
 /// Tests for svx/source/unodraw/ code.
 class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 6e4891d4f011..47c9a5179e31 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -493,8 +493,8 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
     if ( mxShape.is() )
     {
 
-        static const char sBoundRectName[] = "BoundRect";
-        static const char sAnchorPositionName[] = "AnchorPosition";
+        static const OUStringLiteral sBoundRectName = u"BoundRect";
+        static const OUStringLiteral sAnchorPositionName = u"AnchorPosition";
 
         // Get the shape's bounding box in internal coordinates (in 100th of
         // mm).  Use the property BoundRect.  Only if that is not supported ask
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 27f5cbe31425..479378b2fe5f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1670,7 +1670,7 @@ void FmGridControl::InitColumnByField(
     }
 
     // the control type is determined by the ColumnServiceName
-    static const char s_sPropColumnServiceName[] = "ColumnServiceName";
+    static const OUStringLiteral s_sPropColumnServiceName = u"ColumnServiceName";
     if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) )
         return;
 
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index cc1c314a781d..640457278dc2 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -82,8 +82,8 @@ using namespace ::dbtools;
 
 using ::com::sun::star::util::XNumberFormatter;
 
-const char INVALIDTEXT[] = "###";
-const char OBJECTTEXT[] = "<OBJECT>";
+const OUStringLiteral INVALIDTEXT = u"###";
+const OUStringLiteral OBJECTTEXT = u"<OBJECT>";
 
 
 //= helper
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 92d21e907c32..0ea146643a62 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -122,7 +122,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
         Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
         Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW );
 
-        static const char sRefDevicePropName[] = "ReferenceDevice";
+        static const OUStringLiteral sRefDevicePropName = u"ReferenceDevice";
         if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) )
         {
             VCLXDevice* pUnoRefDevice = new VCLXDevice;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 355736067a75..6ce26d06d058 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -677,7 +677,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
                 // TODO: we should cache all those things, else this might be too expensive.
                 // However, this requires we're notified of changes in the value binding
 
-                static const char s_sExternalData[] = "ExternalData";
+                static const OUStringLiteral s_sExternalData = u"ExternalData";
                 if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) )
                 {
                     bool bExternalData = true;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index edbe9ff49b93..a66e23ede35d 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3552,7 +3552,7 @@ namespace
     {
         try
         {
-            static const char s_sFormsCheckRequiredFields[] = "FormsCheckRequiredFields";
+            static const OUStringLiteral s_sFormsCheckRequiredFields = u"FormsCheckRequiredFields";
 
             // first, check whether the form has a property telling us the answer
             // this allows people to use the XPropertyContainer interface of a form to control
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index b265d039622c..9c8ef924390a 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -343,8 +343,8 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
 
             if( xContentAccess.is() )
             {
-                static const char s_sTitle[] = "Title";
-                static const char s_sIsReadOnly[] = "IsReadOnly";
+                static const OUStringLiteral s_sTitle = u"Title";
+                static const OUStringLiteral s_sIsReadOnly = u"IsReadOnly";
 
                 while( xResultSet->next() )
                 {
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 30c199144e8b..15590fc5be55 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -35,7 +35,7 @@
 using namespace css;
 using namespace css::uno;
 
-const char SIDEBARGRADIENT[] = "sidebargradient";
+const OStringLiteral SIDEBARGRADIENT = "sidebargradient";
 
 namespace svx::sidebar {
 
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index f1b49ebde5c1..287a8f90343e 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -31,7 +31,7 @@
 using namespace css;
 using namespace css::uno;
 
-const char SELECTWIDTH[] = "SelectWidth";
+const OStringLiteral SELECTWIDTH = "SelectWidth";
 
 namespace svx::sidebar {
 
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 99126931ad1d..4d74ebcd94b8 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -48,7 +48,7 @@
 using namespace css;
 using namespace css::uno;
 
-const char USERITEM_NAME[] = "FitItem";
+const OUStringLiteral USERITEM_NAME = u"FitItem";
 
 namespace svx::sidebar {
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 23eb06465e87..2c8602847fde 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -407,7 +407,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
     css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager());
     if ( xLayoutManager.is() )
     {
-        static const char aMenuBarURL[] = "private:resource/menubar/menubar";
+        static const OUStringLiteral aMenuBarURL = u"private:resource/menubar/menubar";
         if ( !xLayoutManager->isElementVisible( aMenuBarURL ) )
             xLayoutManager->createElement( aMenuBarURL );
     }
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index ea3b7603b962..5398663f1740 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -44,8 +44,8 @@ namespace svx
 {
 
 const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
-const char g_sExtrusionDirection[] = ".uno:ExtrusionDirection";
-const char g_sExtrusionProjection[] = ".uno:ExtrusionProjection";
+const OUStringLiteral g_sExtrusionDirection = u".uno:ExtrusionDirection";
+const OUStringLiteral g_sExtrusionProjection = u".uno:ExtrusionProjection";
 
 const std::u16string_view aLightOffBmps[] =
 {
@@ -563,8 +563,8 @@ com_sun_star_comp_svx_ExtrusionDepthController_get_implementation(
 }
 
 
-const char g_sExtrusionLightingDirection[] = ".uno:ExtrusionLightingDirection";
-const char g_sExtrusionLightingIntensity[] = ".uno:ExtrusionLightingIntensity";
+const OUStringLiteral g_sExtrusionLightingDirection = u".uno:ExtrusionLightingDirection";
+const OUStringLiteral g_sExtrusionLightingIntensity = u".uno:ExtrusionLightingIntensity";
 
 ExtrusionLightingWindow::ExtrusionLightingWindow(svt::PopupWindowController* pControl,
                                                  weld::Widget* pParent)
@@ -795,7 +795,7 @@ com_sun_star_comp_svx_ExtrusionLightingControl_get_implementation(
 }
 
 
-const char g_sExtrusionSurface[] = ".uno:ExtrusionSurface";
+const OUStringLiteral g_sExtrusionSurface = u".uno:ExtrusionSurface";
 
 ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/surfacewindow.ui", "SurfaceWindow")
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a1860eea7126..dc697903a51f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -66,12 +66,12 @@ using namespace css;
 
 namespace {
 
-const char COMMAND_FINDTEXT[] = ".uno:FindText";
-const char COMMAND_DOWNSEARCH[] = ".uno:DownSearch";
-const char COMMAND_UPSEARCH[] = ".uno:UpSearch";
-const char COMMAND_FINDALL[] = ".uno:FindAll";
-const char COMMAND_MATCHCASE[] = ".uno:MatchCase";
-const char COMMAND_SEARCHFORMATTED[] = ".uno:SearchFormattedDisplayString";
+const OUStringLiteral COMMAND_FINDTEXT = u".uno:FindText";
+const OUStringLiteral COMMAND_DOWNSEARCH = u".uno:DownSearch";
+const OUStringLiteral COMMAND_UPSEARCH = u".uno:UpSearch";
+const OUStringLiteral COMMAND_FINDALL = u".uno:FindAll";
+const OUStringLiteral COMMAND_MATCHCASE = u".uno:MatchCase";
+const OUStringLiteral COMMAND_SEARCHFORMATTED = u".uno:SearchFormattedDisplayString";
 
 const sal_Int32       REMEMBER_SIZE = 10;
 
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 5297f304b7bf..96d73abb5fd9 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -115,8 +115,8 @@ static void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults
 
 static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
 {
-    static const char sExtrusion[] = "Extrusion";
-    static const char sRotateAngle[] = "RotateAngle";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
+    static const OUStringLiteral sRotateAngle = u"RotateAngle";
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -615,7 +615,7 @@ static void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rS
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -762,7 +762,7 @@ static void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& r
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -817,7 +817,7 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -902,7 +902,7 @@ static void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -981,7 +981,7 @@ static void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxIte
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const Direction3D * pLighting1Defaults;
     const Direction3D * pLighting2Defaults;
@@ -1060,7 +1060,7 @@ static void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxIte
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -1127,7 +1127,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
 
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const css::uno::Any* pAny;
 
@@ -1196,7 +1196,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
 namespace svx {
 bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded )
 {
-    static const char  sExtrusion[] = "Extrusion";
+    static const OUStringLiteral sExtrusion = u"Extrusion";
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 308f4d2f6b60..cbdd9d5804f7 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -210,7 +210,7 @@ bool checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatu
     if ( nCheckStatus & 2 )
         return ( nCheckStatus & 1 ) != 0;
 
-    static const char sTextPath[] = "TextPath";
+    static const OUStringLiteral sTextPath = u"TextPath";
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     const size_t nCount = rMarkList.GetMarkCount();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index dca42fc19dce..1715a6dea257 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3121,49 +3121,49 @@ OUString SAL_CALL SvxShape::getImplementationName()
     return "SvxShape";
 }
 
-const char sUNO_service_style_ParagraphProperties[]          = "com.sun.star.style.ParagraphProperties";
-const char sUNO_service_style_ParagraphPropertiesComplex[]   = "com.sun.star.style.ParagraphPropertiesComplex";
-const char sUNO_service_style_ParagraphPropertiesAsian[]     = "com.sun.star.style.ParagraphPropertiesAsian";
-const char sUNO_service_style_CharacterProperties[]          = "com.sun.star.style.CharacterProperties";
-const char sUNO_service_style_CharacterPropertiesComplex[]   = "com.sun.star.style.CharacterPropertiesComplex";
-const char sUNO_service_style_CharacterPropertiesAsian[]     = "com.sun.star.style.CharacterPropertiesAsian";
-
-const char sUNO_service_drawing_FillProperties[]             = "com.sun.star.drawing.FillProperties";
-const char sUNO_service_drawing_TextProperties[]             = "com.sun.star.drawing.TextProperties";
-const char sUNO_service_drawing_LineProperties[]             = "com.sun.star.drawing.LineProperties";
-const char sUNO_service_drawing_ConnectorProperties[]        = "com.sun.star.drawing.ConnectorProperties";
-const char sUNO_service_drawing_MeasureProperties[]          = "com.sun.star.drawing.MeasureProperties";
-const char sUNO_service_drawing_ShadowProperties[]           = "com.sun.star.drawing.ShadowProperties";
-
-const char sUNO_service_drawing_RotationDescriptor[]         = "com.sun.star.drawing.RotationDescriptor";
-
-const char sUNO_service_drawing_Text[]                       = "com.sun.star.drawing.Text";
-const char sUNO_service_drawing_GroupShape[]                 = "com.sun.star.drawing.GroupShape";
-
-const char sUNO_service_drawing_CustomShapeProperties[]      = "com.sun.star.drawing.CustomShapeProperties";
-const char sUNO_service_drawing_CustomShape[]                = "com.sun.star.drawing.CustomShape";
-
-const char sUNO_service_drawing_PolyPolygonDescriptor[]      = "com.sun.star.drawing.PolyPolygonDescriptor";
-const char sUNO_service_drawing_PolyPolygonBezierDescriptor[]= "com.sun.star.drawing.PolyPolygonBezierDescriptor";
-
-const char sUNO_service_drawing_LineShape[]                  = "com.sun.star.drawing.LineShape";
-const char sUNO_service_drawing_Shape[]                      = "com.sun.star.drawing.Shape";
-const char sUNO_service_drawing_RectangleShape[]             = "com.sun.star.drawing.RectangleShape";
-const char sUNO_service_drawing_EllipseShape[]               = "com.sun.star.drawing.EllipseShape";
-const char sUNO_service_drawing_PolyPolygonShape[]           = "com.sun.star.drawing.PolyPolygonShape";
-const char sUNO_service_drawing_PolyLineShape[]              = "com.sun.star.drawing.PolyLineShape";
-const char sUNO_service_drawing_OpenBezierShape[]            = "com.sun.star.drawing.OpenBezierShape";
-const char sUNO_service_drawing_ClosedBezierShape[]          = "com.sun.star.drawing.ClosedBezierShape";
-const char sUNO_service_drawing_TextShape[]                  = "com.sun.star.drawing.TextShape";
-const char sUNO_service_drawing_GraphicObjectShape[]         = "com.sun.star.drawing.GraphicObjectShape";
-const char sUNO_service_drawing_OLE2Shape[]                  = "com.sun.star.drawing.OLE2Shape";
-const char sUNO_service_drawing_PageShape[]                  = "com.sun.star.drawing.PageShape";
-const char sUNO_service_drawing_CaptionShape[]               = "com.sun.star.drawing.CaptionShape";
-const char sUNO_service_drawing_MeasureShape[]               = "com.sun.star.drawing.MeasureShape";
-const char sUNO_service_drawing_FrameShape[]                 = "com.sun.star.drawing.FrameShape";
-const char sUNO_service_drawing_ControlShape[]               = "com.sun.star.drawing.ControlShape";
-const char sUNO_service_drawing_ConnectorShape[]             = "com.sun.star.drawing.ConnectorShape";
-const char sUNO_service_drawing_MediaShape[]                 = "com.sun.star.drawing.MediaShape";
+const OUStringLiteral sUNO_service_style_ParagraphProperties = u"com.sun.star.style.ParagraphProperties";
+const OUStringLiteral sUNO_service_style_ParagraphPropertiesComplex = u"com.sun.star.style.ParagraphPropertiesComplex";
+const OUStringLiteral sUNO_service_style_ParagraphPropertiesAsian = u"com.sun.star.style.ParagraphPropertiesAsian";
+const OUStringLiteral sUNO_service_style_CharacterProperties = u"com.sun.star.style.CharacterProperties";
+const OUStringLiteral sUNO_service_style_CharacterPropertiesComplex = u"com.sun.star.style.CharacterPropertiesComplex";
+const OUStringLiteral sUNO_service_style_CharacterPropertiesAsian = u"com.sun.star.style.CharacterPropertiesAsian";
+
+const OUStringLiteral sUNO_service_drawing_FillProperties    = u"com.sun.star.drawing.FillProperties";
+const OUStringLiteral sUNO_service_drawing_TextProperties    = u"com.sun.star.drawing.TextProperties";
+const OUStringLiteral sUNO_service_drawing_LineProperties    = u"com.sun.star.drawing.LineProperties";
+const OUStringLiteral sUNO_service_drawing_ConnectorProperties = u"com.sun.star.drawing.ConnectorProperties";
+const OUStringLiteral sUNO_service_drawing_MeasureProperties = u"com.sun.star.drawing.MeasureProperties";
+const OUStringLiteral sUNO_service_drawing_ShadowProperties  = u"com.sun.star.drawing.ShadowProperties";
+
+const OUStringLiteral sUNO_service_drawing_RotationDescriptor = u"com.sun.star.drawing.RotationDescriptor";
+
+const OUStringLiteral sUNO_service_drawing_Text              = u"com.sun.star.drawing.Text";
+const OUStringLiteral sUNO_service_drawing_GroupShape        = u"com.sun.star.drawing.GroupShape";
+
+const OUStringLiteral sUNO_service_drawing_CustomShapeProperties = u"com.sun.star.drawing.CustomShapeProperties";
+const OUStringLiteral sUNO_service_drawing_CustomShape       = u"com.sun.star.drawing.CustomShape";
+
+const OUStringLiteral sUNO_service_drawing_PolyPolygonDescriptor = u"com.sun.star.drawing.PolyPolygonDescriptor";
+const OUStringLiteral sUNO_service_drawing_PolyPolygonBezierDescriptor= u"com.sun.star.drawing.PolyPolygonBezierDescriptor";
+
+const OUStringLiteral sUNO_service_drawing_LineShape         = u"com.sun.star.drawing.LineShape";
+const OUStringLiteral sUNO_service_drawing_Shape             = u"com.sun.star.drawing.Shape";
+const OUStringLiteral sUNO_service_drawing_RectangleShape    = u"com.sun.star.drawing.RectangleShape";
+const OUStringLiteral sUNO_service_drawing_EllipseShape      = u"com.sun.star.drawing.EllipseShape";
+const OUStringLiteral sUNO_service_drawing_PolyPolygonShape  = u"com.sun.star.drawing.PolyPolygonShape";
+const OUStringLiteral sUNO_service_drawing_PolyLineShape     = u"com.sun.star.drawing.PolyLineShape";
+const OUStringLiteral sUNO_service_drawing_OpenBezierShape   = u"com.sun.star.drawing.OpenBezierShape";
+const OUStringLiteral sUNO_service_drawing_ClosedBezierShape = u"com.sun.star.drawing.ClosedBezierShape";
+const OUStringLiteral sUNO_service_drawing_TextShape         = u"com.sun.star.drawing.TextShape";
+const OUStringLiteral sUNO_service_drawing_GraphicObjectShape = u"com.sun.star.drawing.GraphicObjectShape";
+const OUStringLiteral sUNO_service_drawing_OLE2Shape         = u"com.sun.star.drawing.OLE2Shape";
+const OUStringLiteral sUNO_service_drawing_PageShape         = u"com.sun.star.drawing.PageShape";
+const OUStringLiteral sUNO_service_drawing_CaptionShape      = u"com.sun.star.drawing.CaptionShape";
+const OUStringLiteral sUNO_service_drawing_MeasureShape      = u"com.sun.star.drawing.MeasureShape";
+const OUStringLiteral sUNO_service_drawing_FrameShape        = u"com.sun.star.drawing.FrameShape";
+const OUStringLiteral sUNO_service_drawing_ControlShape      = u"com.sun.star.drawing.ControlShape";
+const OUStringLiteral sUNO_service_drawing_ConnectorShape    = u"com.sun.star.drawing.ConnectorShape";
+const OUStringLiteral sUNO_service_drawing_MediaShape        = u"com.sun.star.drawing.MediaShape";
 
 
 uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()