summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-21 12:15:26 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:29 +0200
commitf61dbc302975aaa253b00ea6b141bb12474b3c95 (patch)
tree7150ea10f0111c4e6677030ac568c7be03424e08 /sd
parentb44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff)
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes. This is a followup patch to commit 272b1dd55797aacf511fb4342b0054e3697243f6 "new loplugin: change virtual methods to non-virtual" Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/sdpage.hxx16
-rw-r--r--sd/source/ui/inc/View.hxx10
-rw-r--r--sd/source/ui/inc/dlgctrls.hxx2
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCommand.hxx39
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx1
7 files changed, 15 insertions, 56 deletions
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 0685cce9f1e7..522791559aff 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -265,29 +265,29 @@ public:
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType,
const Rectangle& rOldBoundRect) SAL_OVERRIDE;
- void SetLayoutName(const OUString& aName);
+ void SetLayoutName(const OUString& aName);
virtual OUString GetLayoutName() const SAL_OVERRIDE { return maLayoutName; }
void SetFileName(const OUString& aName) { maFileName = aName; }
- OUString GetFileName() const { return maFileName; }
+ OUString GetFileName() const { return maFileName; }
void SetBookmarkName(const OUString& aName) { maBookmarkName = aName; }
- OUString GetBookmarkName() const { return maBookmarkName; }
+ OUString GetBookmarkName() const { return maBookmarkName; }
SdPageLink* GetLink() { return mpPageLink; }
void ConnectLink();
void DisconnectLink();
- void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
+ void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
bool bScaleAllObj);
- const OUString& GetName() const;
- OUString GetRealName() const { return FmFormPage::GetName(); };
+ const OUString& GetName() const;
+ OUString GetRealName() const { return FmFormPage::GetName(); };
- void SetPresentationLayout(const OUString& rLayoutName,
+ void SetPresentationLayout(const OUString& rLayoutName,
bool bReplaceStyleSheets = true,
bool bSetMasterPage = true,
bool bReverseOrder = false);
- void EndListenOutlineText();
+ void EndListenOutlineText();
void SetBackgroundFullSize( bool bIn );
bool IsBackgroundFullSize() const { return mbBackgroundFullSize; }
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 9f8455622d12..944d7e0e8a1b 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -98,13 +98,13 @@ public:
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
virtual void MarkListHasChanged() SAL_OVERRIDE;
virtual void ModelHasChanged() SAL_OVERRIDE;
- void SelectAll();
- void DoCut(vcl::Window* pWindow=NULL);
- void DoCopy(vcl::Window* pWindow=NULL);
- void DoPaste(vcl::Window* pWindow=NULL);
+ void SelectAll();
+ void DoCut(vcl::Window* pWindow=NULL);
+ void DoCopy(vcl::Window* pWindow=NULL);
+ void DoPaste(vcl::Window* pWindow=NULL);
virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE;
virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false);
- void StartDrag( const Point& rStartPos, vcl::Window* pWindow );
+ void StartDrag( const Point& rStartPos, vcl::Window* pWindow );
virtual void DragFinished( sal_Int8 nDropAction );
virtual sal_Int8 AcceptDrop (
const AcceptDropEvent& rEvt,
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
index d46bf2cc64a2..daa1ad28ac4f 100644
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ b/sd/source/ui/inc/dlgctrls.hxx
@@ -37,7 +37,7 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox
public:
FadeEffectLB(vcl::Window* pParent, WinBits nStyle);
virtual ~FadeEffectLB();
- void Fill();
+ void Fill();
/* void selectEffectFromPage( SdPage* pPage ); */
void applySelected( SdPage* pSlide ) const;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 1ca849a83e3f..bd1ac112877b 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -85,7 +85,7 @@ private:
DECL_LINK( CheckFileHdl, void * );
void UpdateTree();
- void OpenFileDialog();
+ void OpenFileDialog();
::com::sun::star::presentation::ClickAction GetActualClickAction();
void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA );
void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE );
diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx
deleted file mode 100644
index 7f6017e1a966..000000000000
--- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx
+++ /dev/null
@@ -1,39 +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_SLIDESORTER_CONTROLLER_SLSCOMMAND_HXX
-#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CONTROLLER_SLSCOMMAND_HXX
-
-namespace sd { namespace slidesorter { namespace controller {
-
-/** Base class for command objects. It specifies the interface for commands
- whose execution can be scheduled via the SlotManager.
-*/
-class Command
-{
-public:
- virtual ~Command (void) {};
- ;
-};
-
-} } } // end of namespace sd::slidesorter::controller
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 8c12d481e288..08903068387e 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -20,7 +20,6 @@
#include "controller/SlsSelectionManager.hxx"
#include "SlideSorter.hxx"
-#include "SlsCommand.hxx"
#include "controller/SlideSorterController.hxx"
#include "controller/SlsAnimator.hxx"
#include "controller/SlsAnimationFunction.hxx"
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 12a027ded663..24712a5bd941 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -35,7 +35,6 @@
#include "controller/SlsSelectionFunction.hxx"
#include "controller/SlsSelectionManager.hxx"
#include "controller/SlsSelectionObserver.hxx"
-#include "SlsCommand.hxx"
#include "model/SlideSorterModel.hxx"
#include "model/SlsPageEnumerationProvider.hxx"
#include "model/SlsPageDescriptor.hxx"