Remove dead code related to unused WITH_SVP_LISTENING

Change-Id: I8a12d0ea18a60541d9a11db26cc417a190443ff4

5 files changed, 15 insertions, 56 deletions

diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 9acc4b04d4e5..f769cf5e5687 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -20,10 +20,15 @@
 #ifndef SVP_SVBMP_HXX
 #define SVP_SVBMP_HXX
 
+#include "sal/config.h"
+
+#include "basebmp/bitmapdevice.hxx"
+
 #include <salbmp.hxx>
-#include "svpelement.hxx"
 
-class SvpSalBitmap : public SalBitmap, public SvpElement
+#define SVP_DEFAULT_BITMAP_FORMAT basebmp::Format::TWENTYFOUR_BIT_TC_MASK
+
+class SvpSalBitmap : public SalBitmap
 {
     basebmp::BitmapDeviceSharedPtr     m_aBitmap;
 public:
@@ -33,9 +38,6 @@ public:
     const basebmp::BitmapDeviceSharedPtr& getBitmap() const { return m_aBitmap; }
     void setBitmap( const basebmp::BitmapDeviceSharedPtr& rSrc ) { m_aBitmap = rSrc; }
 
-    // SvpElement
-    virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aBitmap; }
-
     // SalBitmap
     virtual bool            Create( const Size& rSize,
                                     sal_uInt16 nBitCount,
@@ -56,6 +58,7 @@ public:
     virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool            GetSystemData( BitmapSystemData& rData );
 
+    static sal_uInt32 getBitCountFromScanlineFormat( sal_Int32 nFormat );
 };
 
 #endif
diff --git a/vcl/inc/headless/svpelement.hxx b/vcl/inc/headless/svpelement.hxx
deleted file mode 100644
index 42c18812aa15..000000000000
--- a/vcl/inc/headless/svpelement.hxx
+++ /dev/null
@@ -1,40 +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 _SVP_SVPELEMENT_HXX
-#define _SVP_SVPELEMENT_HXX
-
-#include <basebmp/bitmapdevice.hxx>
-
-#define SVP_DEFAULT_BITMAP_FORMAT basebmp::Format::TWENTYFOUR_BIT_TC_MASK
-
-class SvpElement
-{
-    protected:
-    SvpElement();
-    virtual ~SvpElement();
-    public:
-    virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const = 0;
-
-    static sal_uInt32 getBitCountFromScanlineFormat( sal_Int32 nFormat );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 112e552298b9..4a052c079197 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -21,9 +21,9 @@
 
 #include <vcl/sysdata.hxx>
 #include <basegfx/range/b2ibox.hxx>
+#include <basebmp/bitmapdevice.hxx>
 
 #include <salframe.hxx>
-#include "svpelement.hxx"
 
 #include <list>
 
@@ -34,7 +34,7 @@
 class SvpSalInstance;
 class SvpSalGraphics;
 
-class SvpSalFrame : public SalFrame, public SvpElement
+class SvpSalFrame : public SalFrame
 {
     SvpSalInstance*                     m_pInstance;
     SvpSalFrame*                        m_pParent;       // pointer to parent frame
@@ -69,8 +69,9 @@ public:
     void PostPaint(bool bImmediate) const;
     void AllocateFrame();
 
-    // SvpElement
-    virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aFrame; }
+#if defined IOS || defined ANDROID
+    const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aFrame; }
+#endif
 
     // SalFrame
     virtual SalGraphics*        GetGraphics();
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index be80d29f13b5..275789958c7f 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -104,7 +104,6 @@ public:
     SvpSalGraphics();
     virtual ~SvpSalGraphics();
 
-    const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aDevice; }
     void setDevice( basebmp::BitmapDeviceSharedPtr& rDevice );
 
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 8650a013e369..2bb850d10e50 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -21,7 +21,6 @@
 #define _SVP_SVPVD_HXX
 
 #include <salvd.hxx>
-#include "svpelement.hxx"
 
 #include <list>
 
@@ -31,19 +30,16 @@
 
 class SvpSalGraphics;
 
-class SvpSalVirtualDevice : public SalVirtualDevice, public SvpElement
+class SvpSalVirtualDevice : public SalVirtualDevice
 {
     sal_uInt16                          m_nBitCount;
     basebmp::BitmapDeviceSharedPtr      m_aDevice;
     std::list< SvpSalGraphics* >        m_aGraphics;
 
 public:
-    SvpSalVirtualDevice( sal_uInt16 nBitCount ) : SvpElement(), m_nBitCount(nBitCount) {}
+    SvpSalVirtualDevice( sal_uInt16 nBitCount ) : m_nBitCount(nBitCount) {}
     virtual ~SvpSalVirtualDevice();
 
-    // SvpElement
-    virtual const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aDevice; }
-
     // SalVirtualDevice
     virtual SalGraphics*    GetGraphics();
     virtual void            ReleaseGraphics( SalGraphics* pGraphics );