2 files changed, 8 insertions, 66 deletions
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index 4be5a1c14fe3..3c9d6de44cf7 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FUOLTEXT_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FUOLTEXT_HXX
 
-#include "fuoutl.hxx"
+#include "fupoor.hxx"
 
 class SdDrawDocument;
 class SfxRequest;
@@ -31,17 +31,21 @@ namespace sd {
 
 class View;
 class ViewShell;
+class OutlineView;
+class OutlineViewShell;
 
 /**
  * text functions in outline mode
  */
 class FuOutlineText
-    : public FuOutline
+    : public FuPoor
 {
 public:
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
+    virtual bool Command(const CommandEvent& rCEvt) override;
+
     virtual bool KeyInput(const KeyEvent& rKEvt) override;
     virtual bool MouseMove(const MouseEvent& rMEvt) override;
     virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
@@ -52,9 +56,6 @@ public:
     virtual void DoPaste() override;
     virtual void DoPasteUnformatted() override;
 
-    virtual void Activate() override;           // Function aktivieren
-    virtual void Deactivate() override;         // Function deaktivieren
-
     /** Call this method when the text in the outliner (may) has changed.
         It will invalidate some slots of the view frame and update the
         preview in the slide sorter.
@@ -69,6 +70,8 @@ protected:
         SdDrawDocument* pDoc,
         SfxRequest& rReq);
 
+    OutlineViewShell* pOutlineViewShell;
+    OutlineView* pOutlineView;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
deleted file mode 100644
index d4cae3b4c0e1..000000000000
--- a/sd/source/ui/inc/fuoutl.hxx
+++ /dev/null
@@ -1,61 +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_FUOUTL_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_FUOUTL_HXX
-
-#include "fupoor.hxx"
-
-class SdDrawDocument;
-class SfxRequest;
-
-namespace sd {
-
-class OutlineView;
-class OutlineViewShell;
-class View;
-class ViewShell;
-
-/**
- * Base class of functions of outline mode
- */
-class FuOutline
-    : public FuPoor
-{
-public:
-
-    virtual bool Command(const CommandEvent& rCEvt) override;
-
-protected:
-    FuOutline (
-        ViewShell* pViewShell,
-        ::sd::Window* pWindow,
-        ::sd::View* pView,
-        SdDrawDocument* pDoc,
-        SfxRequest& rReq);
-
-    OutlineViewShell* pOutlineViewShell;
-    OutlineView* pOutlineView;
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */