summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-09-16 16:08:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-18 11:02:45 +0000
commite592877844573fa5ab934b7ab3b13aaa33ed621d (patch)
tree37138edadc35f0fe1a4ee87bcce66e4d756af469 /sd
parent17d7ac5c1a06d29cbeeb3efd245ebf2e6725da12 (diff)
loplugin:unusedenumvalues
Change-Id: Icf17f936ce6d07d0e152252833c8645cf9b1163b Reviewed-on: https://gerrit.libreoffice.org/28942 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/fadedef.h6
-rw-r--r--sd/inc/resltn.hxx7
-rw-r--r--sd/inc/sdxmlwrp.hxx1
-rw-r--r--sd/source/filter/eppt/epptbase.hxx3
-rw-r--r--sd/source/ui/inc/SidebarPanelId.hxx48
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx3
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx19
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.hxx3
-rw-r--r--sd/source/ui/unoidl/facreg.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx1
11 files changed, 5 insertions, 89 deletions
diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h
index 88823fb6159b..2754990ca564 100644
--- a/sd/inc/fadedef.h
+++ b/sd/inc/fadedef.h
@@ -23,12 +23,6 @@
// has to be adjusted!
#define FADE_EFFECT_COUNT 57
-enum FadeSpeed
-{
- FADE_SPEED_SLOW,
- FADE_SPEED_MEDIUM,
- FADE_SPEED_FAST
-};
// has to be adjusted!
#define FADE_SPEED_COUNT 3
diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx
index e687a686e0c2..b5e1894e776b 100644
--- a/sd/inc/resltn.hxx
+++ b/sd/inc/resltn.hxx
@@ -20,13 +20,6 @@
#ifndef INCLUDED_SD_INC_RESLTN_HXX
#define INCLUDED_SD_INC_RESLTN_HXX
-enum PublishingResolution
-{
- RESOLUTION_HIGH,
- RESOLUTION_MEDIUM,
- RESOLUTION_LOW
-};
-
enum PublishingFormat
{
FORMAT_GIF,
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 2cdcf89cd542..8db03c54759f 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -26,7 +26,6 @@
enum SdXMLFilterMode
{
SDXMLMODE_Normal, ///< standard load and save of the complete document
- SDXMLMODE_Preview, ///< only for import, only the first draw page and its master page is loaded
SDXMLMODE_Organizer ///< only for import, only the styles are loaded
};
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 6e576e8ec07d..af03a99c7d30 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -210,9 +210,6 @@ enum PPTExTextAttr
ParaAttr_TextOfs,
ParaAttr_BulletOfs,
ParaAttr_DefaultTab,
- ParaAttr_AsianLB_1,
- ParaAttr_AsianLB_2,
- ParaAttr_AsianLB_3,
ParaAttr_BiDi,
CharAttr_Bold,
CharAttr_Italic,
diff --git a/sd/source/ui/inc/SidebarPanelId.hxx b/sd/source/ui/inc/SidebarPanelId.hxx
deleted file mode 100644
index 78c547353833..000000000000
--- a/sd/source/ui/inc/SidebarPanelId.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SD_SOURCE_UI_INC_SIDEBARPANELID_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_SIDEBARPANELID_HXX
-
-namespace rtl
-{
- class OUString;
-}
-
-namespace sd { namespace sidebar {
-
-/** List of top level panels that can be shown in the task pane.
-*/
-enum PanelId
-{
- PID_UNKNOWN,
- PID_MASTER_PAGES_ALL,
- PID_MASTER_PAGES_RECENT,
- PID_MASTER_PAGES_USED,
- PID_LAYOUT,
- PID_TABLE_DESIGN,
- PID_ANIMATION_SCHEMES,
- PID_CUSTOM_ANIMATION,
- PID_SLIDE_TRANSITION
-};
-
-} } // namespace sd::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 100eac7944cf..f0f19a791366 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -83,8 +83,7 @@ public:
{
NormalMode,
MultiSelectionMode,
- DragAndDropMode,
- ButtonMode
+ DragAndDropMode
};
void SwitchToNormalMode();
void SwitchToDragAndDropMode(const Point& rMousePosition);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index dbfc6b077adc..ddc36a5c50cd 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -40,26 +40,13 @@ using ::sd::slidesorter::view::Layouter;
namespace sd { namespace slidesorter {
-namespace {
- enum Properties
- {
- PropertyDocumentSlides,
- PropertyHighlightCurrentSlide,
- PropertyShowSelection,
- PropertyCenterSelection,
- PropertySuspendPreviewUpdatesDuringFullScreenPresentation,
- PropertyOrientationVertical
- };
-}
-
//===== SlideSorterService ==========================================================
-SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxContext)
+SlideSorterService::SlideSorterService()
: SlideSorterServiceInterfaceBase(m_aMutex),
mpSlideSorter(),
mxParentWindow()
{
- (void)rxContext;
}
SlideSorterService::~SlideSorterService()
@@ -473,10 +460,10 @@ void SlideSorterService::ThrowIfDisposed()
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext* context,
+com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext* /*context*/,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new sd::slidesorter::SlideSorterService(context));
+ return cppu::acquire(new sd::slidesorter::SlideSorterService);
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index d0baa5cd4fbf..1ae33047158a 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -50,8 +50,7 @@ class SlideSorterService
public SlideSorterServiceInterfaceBase
{
public:
- explicit SlideSorterService (
- const css::uno::Reference<css::uno::XComponentContext>& rxContext);
+ explicit SlideSorterService();
virtual ~SlideSorterService() override;
SlideSorterService(const SlideSorterService&) = delete;
SlideSorterService& operator=(const SlideSorterService&) = delete;
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 7493fcafa0d9..eb43298013a0 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -40,8 +40,6 @@ enum FactoryId
{
SdDrawingDocumentFactoryId,
SdPresentationDocumentFactoryId,
-
- ModuleControllerFactoryId,
};
typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index f07ba0447ee1..97c6b502b949 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -55,7 +55,6 @@
#include "PresentationViewShell.hxx"
#include "FormShellManager.hxx"
#include "ToolBarManager.hxx"
-#include "SidebarPanelId.hxx"
#include "Window.hxx"
#include "framework/ConfigurationController.hxx"
#include "DocumentRenderer.hxx"
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index f13c20307521..3c2e87c591c2 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -41,7 +41,6 @@
#include "FrameView.hxx"
#include "DrawViewShell.hxx"
#include "ViewShellHint.hxx"
-#include "SidebarPanelId.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>