summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2017-10-27 10:29:14 +0200
committerCaolán McNamara <caolanm@redhat.com>2017-10-27 18:14:53 +0200
commit4805a3a8b6d2e9cc1710b9dced2041a6c7b5e596 (patch)
tree1aa9ecd3cc130e88718c226c7702feeaf82555b4 /vcl
parent5922f9af749ff53e3bda2ff60a52116bf999a8a0 (diff)
Remove some old KDE3 and TDE stuff
Both VCL plugins are long gone. We currently just keep the desktop detection. Generally fall back to gtk in VCL detection. Change-Id: I35830868cb75d16ae7b90b20df699929cefa4636 Reviewed-on: https://gerrit.libreoffice.org/43940 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/gendata.hxx3
-rw-r--r--vcl/inc/unx/tde/tdedata.hxx114
-rw-r--r--vcl/inc/vclpluginapi.h12
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx14
4 files changed, 3 insertions, 140 deletions
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 4088985678a6..fda6680a962a 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -20,8 +20,7 @@ class SalGenericDisplay;
namespace psp { class PrintFontManager; }
enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
- SAL_DATA_TDE3,
- SAL_DATA_KDE3,SAL_DATA_KDE4, SAL_DATA_KDE5,
+ SAL_DATA_KDE4, SAL_DATA_KDE5,
SAL_DATA_UNX, SAL_DATA_SVP,
SAL_DATA_ANDROID, SAL_DATA_IOS,
SAL_DATA_HEADLESS };
diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
deleted file mode 100644
index d8f1363f2f95..000000000000
--- a/vcl/inc/unx/tde/tdedata.hxx
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * Copyright 2012 Timothy Pearson
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
-#define INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
-
-#include <unx/saldisp.hxx>
-#include <unx/saldata.hxx>
-#include <unx/salframe.h>
-
-class TDEData : public X11SalData
-{
-public:
- TDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_TDE, pInstance ) {}
- virtual ~TDEData();
-
- virtual void Init();
- virtual void initNWF();
- virtual void deInitNWF();
-};
-
-class SalTDEDisplay : public SalX11Display
-{
-public:
- SalTDEDisplay( Display* pDisp );
- virtual ~SalTDEDisplay();
-};
-
-class TDESalFrame : public X11SalFrame
-{
- static const int nMaxGraphics = 2;
-
- struct GraphicsHolder
- {
- X11SalGraphics* pGraphics;
- bool bInUse;
- GraphicsHolder()
- : pGraphics( NULL ),
- bInUse( false )
- {}
- ~GraphicsHolder();
- };
- GraphicsHolder m_aGraphics[ nMaxGraphics ];
-
-public:
- TDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
- virtual ~TDESalFrame();
-
- virtual SalGraphics* AcquireGraphics();
- virtual void ReleaseGraphics( SalGraphics *pGraphics );
- virtual void updateGraphics( bool bClear );
- virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Show( bool bVisible, bool bNoActivate );
-};
-
-class TDESalInstance : public X11SalInstance
-{
-public:
- TDESalInstance( SalYieldMutex* pMutex )
- : X11SalInstance( pMutex ) {}
- virtual ~TDESalInstance() {}
- virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
-};
-
-class TDEXLib : public SalXLib
-{
- bool m_bStartupDone;
- void* m_pApplication;
- char** m_pFreeCmdLineArgs;
- char** m_pAppCmdLineArgs;
- int m_nFakeCmdLineArgs;
-public:
- TDEXLib() : SalXLib(),
- m_bStartupDone( false ),
- m_pApplication( NULL ),
- m_pFreeCmdLineArgs( NULL ),
- m_pAppCmdLineArgs( NULL ),
- m_nFakeCmdLineArgs( 0 )
- {}
- virtual ~TDEXLib();
- virtual void Init();
-
- void doStartup();
-};
-
-#endif // INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h
index 5522d2f4ece4..3901b1218d82 100644
--- a/vcl/inc/vclpluginapi.h
+++ b/vcl/inc/vclpluginapi.h
@@ -35,18 +35,6 @@
#define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#if defined VCLPLUG_TDE_IMPLEMENTATION
-#define VCLPLUG_TDE_PUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define VCLPLUG_TDE_PUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined VCLPLUG_KDE_IMPLEMENTATION
-#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#if defined VCLPLUG_KDE4_IMPLEMENTATION
#define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_EXPORT
#else
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 30042369b337..0f301f01d9b4 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -100,7 +100,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
* #i109007# KDE3 seems to have the same problem.
* And same applies for KDE4.
*/
- if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "tde" || rModuleBase == "kde" || rModuleBase == "kde4" )
+ if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "kde4" )
{
pCloseModule = nullptr;
}
@@ -165,15 +165,6 @@ static DesktopType get_desktop_environment()
static SalInstance* autodetect_plugin()
{
- static const char* const pTDEFallbackList[] =
- {
- "tde",
-#if ENABLE_KDE4
- "kde4",
-#endif
- "gtk3", "gtk", "gen", nullptr
- };
-
static const char* const pKDEFallbackList[] =
{
#if ENABLE_KDE4
@@ -203,10 +194,9 @@ static SalInstance* autodetect_plugin()
desktop == DESKTOP_UNITY ||
desktop == DESKTOP_XFCE ||
desktop == DESKTOP_KDE3 ||
+ desktop == DESKTOP_TDE ||
desktop == DESKTOP_MATE )
pList = pStandardFallbackList;
- else if( desktop == DESKTOP_TDE )
- pList = pTDEFallbackList;
else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
pList = pKDEFallbackList;