summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-09-08 22:11:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-09-09 08:25:30 +0200
commitf2517e82904b92989ed7e38a070c18234f460b33 (patch)
tree2b9bb63f3865670ad250f9fd706a577d1696d88f /sd
parent1159f58831c69680e9f10767d5358e13b66579dd (diff)
improve loplugin:unusedvarsglobal
to find any global variable, was checking the wrong property of VarDecl Change-Id: I454b4e0c1701bb0771768a1ee10cd738c4ab0726 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102278 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx12
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx12
-rw-r--r--sd/source/ui/inc/unokywds.hxx47
3 files changed, 0 insertions, 71 deletions
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 4ff28a7d25f6..a6c4fbc67660 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -180,7 +180,6 @@ const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane")
const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane");
-const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane");
// View URLs.
@@ -201,13 +200,6 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( u"private:resource/toolpanel/" );
-const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );
-const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" );
-const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" );
-const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts" );
-const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign" );
-const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations" );
-const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" );
// Event URLs.
const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( u"ResourceActivationRequested" );
@@ -218,10 +210,6 @@ const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( u"Resourc
const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( u"ConfigurationUpdateStart" );
const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( u"ConfigurationUpdateEnd" );
-// Service names of controllers.
-const OUStringLiteral FrameworkHelper::msModuleControllerService(u"com.sun.star.drawing.framework.ModuleController");
-const OUStringLiteral FrameworkHelper::msConfigurationControllerService(u"com.sun.star.drawing.framework.ConfigurationController");
-
//----- helper ----------------------------------------------------------------
namespace
{
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index a144cc243166..a38b541a74c8 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -61,7 +61,6 @@ public:
static const OUString msFullScreenPaneURL;
static const OUString msLeftImpressPaneURL;
static const OUString msLeftDrawPaneURL;
- static const OUString msSidebarPaneURL;
// URLs of frequently used views.
static const OUStringLiteral msViewURLPrefix;
@@ -80,13 +79,6 @@ public:
// URLs of task panels.
static const OUStringLiteral msTaskPanelURLPrefix;
- static const OUString msAllMasterPagesTaskPanelURL;
- static const OUString msRecentMasterPagesTaskPanelURL;
- static const OUString msUsedMasterPagesTaskPanelURL;
- static const OUString msLayoutTaskPanelURL;
- static const OUString msTableDesignPanelURL;
- static const OUString msCustomAnimationTaskPanelURL;
- static const OUString msSlideTransitionTaskPanelURL;
// Names of frequently used events.
static const OUStringLiteral msResourceActivationRequestEvent;
@@ -97,10 +89,6 @@ public:
static const OUStringLiteral msConfigurationUpdateStartEvent;
static const OUStringLiteral msConfigurationUpdateEndEvent;
- // Service names of the common controllers.
- static const OUStringLiteral msModuleControllerService;
- static const OUStringLiteral msConfigurationControllerService;
-
/** Return the FrameworkHelper object that is associated with the given
ViewShellBase. If such an object does not yet exist, a new one is
created.
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index b56f46784d30..6fa44746e00d 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -23,20 +23,7 @@
#include <sal/config.h>
// SdUnoPseudoStyleFamily
-inline const char sUNO_PseudoSheet_Title[] = "title";
-inline const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
inline const char sUNO_PseudoSheet_Background[] = "background";
-inline const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
-inline const char sUNO_PseudoSheet_Notes[] = "notes";
-inline const char sUNO_PseudoSheet_Outline1[] = "outline1";
-inline const char sUNO_PseudoSheet_Outline2[] = "outline2";
-inline const char sUNO_PseudoSheet_Outline3[] = "outline3";
-inline const char sUNO_PseudoSheet_Outline4[] = "outline4";
-inline const char sUNO_PseudoSheet_Outline5[] = "outline5";
-inline const char sUNO_PseudoSheet_Outline6[] = "outline6";
-inline const char sUNO_PseudoSheet_Outline7[] = "outline7";
-inline const char sUNO_PseudoSheet_Outline8[] = "outline8";
-inline const char sUNO_PseudoSheet_Outline9[] = "outline9";
// SdLayer
inline const char sUNO_LayerName_background[] = "background";
@@ -45,37 +32,18 @@ inline const char sUNO_LayerName_layout[] = "layout";
inline const char sUNO_LayerName_controls[] = "controls";
inline const char sUNO_LayerName_measurelines[] = "measurelines";
-// SdXShape
-inline const char sUNO_shape_style[] = "Style";
-inline const char sUNO_shape_layername[] = "LayerName";
-inline const char sUNO_shape_zorder[] = "ZOrder";
-
// services
-inline const char sUNO_Service_StyleFamily[] = "com.sun.star.style.StyleFamily";
-inline const char sUNO_Service_StyleFamilies[] = "com.sun.star.style.StyleFamilies";
-inline const char sUNO_Service_Style[] = "com.sun.star.style.Style";
inline const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties";
-inline const char sUNO_Service_LineProperties[] = "com.sun.star.drawing.LineProperties";
-inline const char sUNO_Service_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties";
-inline const char sUNO_Service_CharacterProperties[] = "com.sun.star.style.CharacterProperties";
-inline const char sUNO_Service_Text[] = "com.sun.star.drawing.Text";
-inline const char sUNO_Service_TextProperties[] = "com.sun.star.drawing.TextProperties";
-inline const char sUNO_Service_ShadowProperties[] = "com.sun.star.drawing.ShadowProperties";
-inline const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.ConnectorProperties";
-inline const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties";
inline const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground";
-inline const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape";
inline const char sUNO_Service_ImageMapRectangleObject[]
= "com.sun.star.image.ImageMapRectangleObject";
inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject";
inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
// properties
-inline const char sUNO_Prop_Background[] = "Background";
inline const char16_t sUNO_Prop_ForbiddenCharacters[] = u"ForbiddenCharacters";
inline const char16_t sUNO_Prop_MapUnit[] = u"MapUnit";
inline const char16_t sUNO_Prop_VisibleArea[] = u"VisibleArea";
-inline const char sUNO_Prop_Aspect[] = "Aspect";
inline const char16_t sUNO_Prop_TabStop[] = u"TabStop";
inline const char16_t sUNO_Prop_CharLocale[] = u"CharLocale";
inline const char16_t sUNO_Prop_AutomContFocus[] = u"AutomaticControlFocus";
@@ -97,21 +65,13 @@ 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_IsQuickEdit[] = "IsQuickEdit";
inline const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit";
inline const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation";
-inline const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy";
inline const char sUNO_View_SlidesPerRow[] = "SlidesPerRow";
-inline const char sUNO_View_DrawMode[] = "DrawMode";
-inline const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode";
-inline const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode";
-inline const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
-inline const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
inline const char sUNO_View_EditMode[] = "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_VisArea[] = "VisArea";
inline const char sUNO_View_GridIsVisible[] = "GridIsVisible";
inline const char sUNO_View_GridIsFront[] = "GridIsFront";
@@ -120,17 +80,10 @@ 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_IsSnapLinesVisible[] = "IsSnapLinesVisible";
-inline const char sUNO_View_IsDragStripes[] = "IsDragStripes";
inline const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible";
inline const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles";
-inline const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways";
inline const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle";
inline const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints";
-inline const char sUNO_View_IsLineDraft[] = "IsLineDraft";
-inline const char sUNO_View_IsFillDraft[] = "IsFillDraft";
-inline const char sUNO_View_IsTextDraft[] = "IsTextDraft";
-inline const char sUNO_View_IsGrafDraft[] = "IsGrafDraft";
inline const char sUNO_View_ActiveLayer[] = "ActiveLayer";
inline const char sUNO_View_NoAttribs[] = "NoAttribs";
inline const char sUNO_View_NoColors[] = "NoColors";