Remove dead code related to unused WITH_SVP_LISTENING

Change-Id: I8a12d0ea18a60541d9a11db26cc417a190443ff4

vcl/Library_vcl.mk

@@ -496,7 +496,6 @@ vcl_generic_code= \
 vcl_headless_code= \
     vcl/headless/svpbmp \
     vcl/headless/svpdummies \
-    vcl/headless/svpelement \
     vcl/headless/svpframe \
     vcl/headless/svpgdi \
     vcl/headless/svpinst \

vcl/StaticLibrary_headless.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,headless,\
 $(eval $(call gb_StaticLibrary_add_exception_objects,headless,\
 	vcl/headless/svpbmp \
 	vcl/headless/svpdummies \
-	vcl/headless/svpelement \
 	vcl/headless/svpframe \
 	vcl/headless/svpprn \
 	vcl/headless/svptext \

vcl/headless/svpbmp.cxx

@@ -349,5 +349,45 @@ bool SvpSalBitmap::GetSystemData( BitmapSystemData& )
     return false;
 }
 
+sal_uInt32 SvpSalBitmap::getBitCountFromScanlineFormat( sal_Int32 nFormat )
+{
+    sal_uInt32 nBitCount = 1;
+    switch( nFormat )
+    {
+        case Format::ONE_BIT_MSB_GREY:
+        case Format::ONE_BIT_LSB_GREY:
+        case Format::ONE_BIT_MSB_PAL:
+        case Format::ONE_BIT_LSB_PAL:
+            nBitCount = 1;
+            break;
+        case Format::FOUR_BIT_MSB_GREY:
+        case Format::FOUR_BIT_LSB_GREY:
+        case Format::FOUR_BIT_MSB_PAL:
+        case Format::FOUR_BIT_LSB_PAL:
+            nBitCount = 4;
+            break;
+        case Format::EIGHT_BIT_PAL:
+        case Format::EIGHT_BIT_GREY:
+            nBitCount = 8;
+            break;
+        case Format::SIXTEEN_BIT_LSB_TC_MASK:
+        case Format::SIXTEEN_BIT_MSB_TC_MASK:
+            nBitCount = 16;
+            break;
+        case Format::TWENTYFOUR_BIT_TC_MASK:
+            nBitCount = 24;
+            break;
+        case Format::THIRTYTWO_BIT_TC_MASK_BGRA:
+        case Format::THIRTYTWO_BIT_TC_MASK_ARGB:
+        case Format::THIRTYTWO_BIT_TC_MASK_ABGR:
+        case Format::THIRTYTWO_BIT_TC_MASK_RGBA:
+            nBitCount = 32;
+            break;
+        default:
+        OSL_FAIL( "unsupported basebmp format" );
+        break;
+    }
+    return nBitCount;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/headless/svpelement.cxx

-/* -*- 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 .
- */
-
-#include "headless/svpelement.hxx"
-
-#include <basebmp/scanlineformats.hxx>
-#include <osl/diagnose.h>
-
-#if defined WITH_SVP_LISTENING
-#include <osl/thread.h>
-#include <vcl/svapp.hxx>
-#include <rtl/strbuf.hxx>
-#include <vcl/bitmap.hxx>
-#include <tools/stream.hxx>
-
-#include "headless/svpvd.hxx"
-#include "headless/svpbmp.hxx"
-#include "headless/svpframe.hxx"
-
-#include <list>
-#include <boost/unordered_map.hpp>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/ip.h>
-#include <stdio.h>
-#include <errno.h>
-
-using namespace basegfx;
-
-class SvpElementContainer
-{
-    std::list< SvpElement* >        m_aElements;
-    int                             m_nSocket;
-    oslThread                       m_aThread;
-
-    SvpElementContainer();
-    ~SvpElementContainer();
-    public:
-    void registerElement( SvpElement* pElement ) { m_aElements.push_back(pElement); }
-    void deregisterElement( SvpElement* pElement ) { m_aElements.remove(pElement); }
-
-    void run();
-    DECL_LINK(processRequest,void*);
-
-    static SvpElementContainer& get();
-};
-
-extern "C" void SAL_CALL SvpContainerThread( void* );
-
-SvpElementContainer& SvpElementContainer::get()
-{
-    static SvpElementContainer* pInstance = new SvpElementContainer();
-    return *pInstance;
-}
-
-SvpElementContainer::SvpElementContainer()
-{
-    static const char* pEnv = getenv("SVP_LISTENER_PORT");
-    int nPort = (pEnv && *pEnv) ? atoi(pEnv) : 8000;
-    m_nSocket = socket( PF_INET, SOCK_STREAM, 0 );
-    if( m_nSocket >= 0)
-    {
-        int nOn = 1;
-        if( setsockopt(m_nSocket, SOL_SOCKET, SO_REUSEADDR,
-                       (char*)&nOn, sizeof(nOn)) )
-        {
-            perror( "SvpElementContainer: changing socket options failed" );
-            close( m_nSocket );
-        }
-        else
-        {
-            struct sockaddr_in addr;
-            memset(&addr, 0, sizeof(struct sockaddr_in));
-            addr.sin_family = AF_INET;
-            addr.sin_port = htons(nPort);
-            addr.sin_addr.s_addr = INADDR_ANY;
-            if( bind(m_nSocket,(struct sockaddr*)&addr,sizeof(addr)) )
-            {
-                perror( "SvpElementContainer: bind() failed" );
-                close( m_nSocket );
-            }
-            else
-            {
-                if( listen( m_nSocket, 0 ) )
-                {
-                    perror( "SvpElementContainer: listen() failed" );
-                    close(m_nSocket);
-                }
-                else
-                {
-                    m_aThread = osl_createThread( SvpContainerThread, this );
-                }
-            }
-        }
-    }
-    else
-        perror( "SvpElementContainer: socket() failed\n" );
-}
-
-SvpElementContainer::~SvpElementContainer()
-{
-}
-
-void SAL_CALL SvpContainerThread(void* pSvpContainer)
-{
-    ((SvpElementContainer*)pSvpContainer)->run();
-}
-
-void SvpElementContainer::run()
-{
-    bool bRun = m_nSocket != 0;
-    while( bRun )
-    {
-        int nLocalSocket = accept( m_nSocket, NULL, NULL );
-        if( nLocalSocket < 0 )
-        {
-            bRun = false;
-            perror( "accept() failed" );
-        }
-        else
-        {
-            Application::PostUserEvent( LINK( this, SvpElementContainer, processRequest ), (void*)nLocalSocket );
-        }
-    }
-    if( m_nSocket )
-        close( m_nSocket );
-}
-
-static const char* matchType( SvpElement* pEle )
-{
-    if( dynamic_cast<SvpSalBitmap*>(pEle) )
-        return "Bitmap";
-    else if( dynamic_cast<SvpSalFrame*>(pEle) )
-        return "Frame";
-    else if( dynamic_cast<SvpSalVirtualDevice*>(pEle) )
-        return "VirtualDevice";
-    return typeid(*pEle).name();
-}
-
-IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket )
-{
-    int nFile = (int)pSocket;
-
-    OStringBuffer aBuf( 256 ), aAnswer( 256 );
-    char c;
-    while( read( nFile, &c, 1 ) && c != '\n' )
-        aBuf.append( sal_Char(c) );
-    OString aCommand( aBuf.makeStringAndClear() );
-    if( aCommand.startsWith( "list" ) )
-    {
-        boost::unordered_map< OString, std::list<SvpElement*>, OStringHash > aMap;
-        for( std::list< SvpElement* >::const_iterator it = m_aElements.begin();
-             it != m_aElements.end(); ++it )
-        {
-            std::list<SvpElement*>& rList = aMap[matchType(*it)];
-            rList.push_back( *it );
-        }
-        for( boost::unordered_map< OString, std::list<SvpElement*>, OStringHash>::const_iterator hash_it = aMap.begin();
-             hash_it != aMap.end(); ++hash_it )
-        {
-            aAnswer.append( "ElementType: " );
-            aAnswer.append( hash_it->first );
-            aAnswer.append( '\n' );
-            for( std::list<SvpElement*>::const_iterator it = hash_it->second.begin();
-                 it != hash_it->second.end(); ++it )
-            {
-                aAnswer.append( sal_Int64(reinterpret_cast<sal_uInt32>(*it)), 16 );
-                aAnswer.append( '\n' );
-            }
-        }
-    }
-    else if( aCommand.startsWith( "get" ) )
-    {
-        sal_IntPtr aId = aCommand.copy( 3 ).toInt64( 16 );
-        SvpElement* pElement = reinterpret_cast<SvpElement*>(aId);
-        for( std::list< SvpElement* >::const_iterator it = m_aElements.begin();
-             it != m_aElements.end(); ++it )
-        {
-            if( *it == pElement )
-            {
-                const basebmp::BitmapDeviceSharedPtr& rDevice = pElement->getDevice();
-                if( rDevice.get() )
-                {
-                    SvpSalBitmap* pSalBitmap = new SvpSalBitmap();
-                    pSalBitmap->setBitmap( rDevice );
-                    Bitmap aBitmap( pSalBitmap );
-                    SvMemoryStream aStream( 256, 256 );
-                    aStream << aBitmap;
-                    aStream.Seek( STREAM_SEEK_TO_END );
-                    int nBytes = aStream.Tell();
-                    aStream.Seek( STREAM_SEEK_TO_BEGIN );
-                    aAnswer.append( (const sal_Char*)aStream.GetData(), nBytes );
-                }
-                break;
-            }
-        }
-    }
-    else if( aCommand.startsWith( "quit" ) )
-    {
-        Application::Quit();
-        close( m_nSocket );
-        m_nSocket = 0;
-    }
-    write( nFile, aAnswer.getStr(), aAnswer.getLength() );
-    close( nFile );
-
-    return 0;
-}
-
-#endif
-
-using namespace basebmp;
-
-SvpElement::SvpElement()
-{
-    #if defined WITH_SVP_LISTENING
-    SvpElementContainer::get().registerElement( this );
-    #endif
-}
-
-SvpElement::~SvpElement()
-{
-    #if defined WITH_SVP_LISTENING
-    SvpElementContainer::get().deregisterElement( this );
-    #endif
-}
-
-sal_uInt32 SvpElement::getBitCountFromScanlineFormat( sal_Int32 nFormat )
-{
-    sal_uInt32 nBitCount = 1;
-    switch( nFormat )
-    {
-        case Format::ONE_BIT_MSB_GREY:
-        case Format::ONE_BIT_LSB_GREY:
-        case Format::ONE_BIT_MSB_PAL:
-        case Format::ONE_BIT_LSB_PAL:
-            nBitCount = 1;
-            break;
-        case Format::FOUR_BIT_MSB_GREY:
-        case Format::FOUR_BIT_LSB_GREY:
-        case Format::FOUR_BIT_MSB_PAL:
-        case Format::FOUR_BIT_LSB_PAL:
-            nBitCount = 4;
-            break;
-        case Format::EIGHT_BIT_PAL:
-        case Format::EIGHT_BIT_GREY:
-            nBitCount = 8;
-            break;
-        case Format::SIXTEEN_BIT_LSB_TC_MASK:
-        case Format::SIXTEEN_BIT_MSB_TC_MASK:
-            nBitCount = 16;
-            break;
-        case Format::TWENTYFOUR_BIT_TC_MASK:
-            nBitCount = 24;
-            break;
-        case Format::THIRTYTWO_BIT_TC_MASK_BGRA:
-        case Format::THIRTYTWO_BIT_TC_MASK_ARGB:
-        case Format::THIRTYTWO_BIT_TC_MASK_ABGR:
-        case Format::THIRTYTWO_BIT_TC_MASK_RGBA:
-            nBitCount = 32;
-            break;
-        default:
-        OSL_FAIL( "unsupported basebmp format" );
-        break;
-    }
-    return nBitCount;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/headless/svpgdi.cxx

@@ -131,7 +131,7 @@ void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 
 sal_uInt16 SvpSalGraphics::GetBitCount() const
 {
-    return SvpElement::getBitCountFromScanlineFormat( m_aDevice->getScanlineFormat() );
+    return SvpSalBitmap::getBitCountFromScanlineFormat( m_aDevice->getScanlineFormat() );
 }
 
 long SvpSalGraphics::GetGraphicsWidth() const

vcl/headless/svpvd.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "headless/svpbmp.hxx"
 #include "headless/svpvd.hxx"
 #include "headless/svpgdi.hxx"
 

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

vcl/inc/headless/svpelement.hxx

-/* -*- 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: */

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();

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 );

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 );