summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-12-13 20:48:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-12-14 10:03:56 +0100
commitdbe467b6c268eb10bb4dbc8d6ebeeec310a0586b (patch)
tree3bb3416d11655ea1475cf574a188e7e59b5e71f0 /vcl
parent9a2a4bc5ed340ba187c8e27db5c8477c990c93af (diff)
loplugin:unusedmethods
Change-Id: I442d99e8f6a7df11dc950c5073f683bffc41a852 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107661 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx3
-rw-r--r--vcl/inc/unx/nativewindowhandleprovider.hxx25
-rw-r--r--vcl/inc/unx/salframe.h5
-rw-r--r--vcl/inc/unx/x11/x11cairotextrender.hxx4
-rw-r--r--vcl/unx/generic/gdi/nativewindowhandleprovider.cxx14
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.cxx24
-rw-r--r--vcl/unx/generic/window/salframe.cxx5
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx5
9 files changed, 1 insertions, 85 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5d5f8c3f3ca2..ff8c4182af2f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -547,7 +547,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/app/salplug \
vcl/unx/generic/printer/jobdata \
vcl/unx/generic/printer/ppdparser \
- vcl/unx/generic/gdi/nativewindowhandleprovider \
vcl/unx/generic/window/screensaverinhibitor \
vcl/unx/generic/printer/cpdmgr \
$(if $(filter TRUE,$(ENABLE_CUPS)),\
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index dcfdddbd30c2..64e1fa905167 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -30,7 +30,6 @@
#include <salframe.hxx>
#include <vcl/idle.hxx>
#include <vcl/sysdata.hxx>
-#include <unx/nativewindowhandleprovider.hxx>
#include <unx/saltype.h>
#include <unx/screensaverinhibitor.hxx>
@@ -63,7 +62,6 @@ class GtkDnDTransferable;
class GtkSalMenu;
class GtkSalFrame final : public SalFrame
- , public NativeWindowHandleProvider
{
struct IMHandler
{
@@ -504,7 +502,6 @@ public:
static GtkSalFrame *getFromWindow( GtkWidget *pWindow );
sal_uIntPtr GetNativeWindowHandle(GtkWidget *pWidget);
- virtual sal_uIntPtr GetNativeWindowHandle() override;
//Call the usual SalFrame Callback, but catch uno exceptions and delegate
//to GtkSalData to rethrow them after the gsignal is processed when its safe
diff --git a/vcl/inc/unx/nativewindowhandleprovider.hxx b/vcl/inc/unx/nativewindowhandleprovider.hxx
deleted file mode 100644
index 1d85cb4cf5ef..000000000000
--- a/vcl/inc/unx/nativewindowhandleprovider.hxx
+++ /dev/null
@@ -1,25 +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/.
- */
-
-#ifndef INCLUDED_VCL_UNX_NATIVEWINDOWHANDLEPROVIDER
-#define INCLUDED_VCL_UNX_NATIVEWINDOWHANDLEPROVIDER
-
-#include <vcl/dllapi.h>
-
-class VCL_PLUGIN_PUBLIC NativeWindowHandleProvider
-{
-public:
- virtual ~NativeWindowHandleProvider();
-
- virtual sal_uIntPtr GetNativeWindowHandle() = 0;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index ead2eedd7ef1..35f41e687229 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -25,7 +25,6 @@
#include <unx/saltype.h>
#include <unx/saldisp.hxx>
#include <unx/screensaverinhibitor.hxx>
-#include <unx/nativewindowhandleprovider.hxx>
#include <salframe.hxx>
#include <salwtype.hxx>
#include <salinst.hxx>
@@ -58,7 +57,7 @@ enum class WMWindowType
Dock
};
-class X11SalFrame final : public SalFrame, public NativeWindowHandleProvider
+class X11SalFrame final : public SalFrame
{
friend class vcl_sal::WMAdaptor;
friend class vcl_sal::NetWMAdaptor;
@@ -259,8 +258,6 @@ public:
// done setting up the clipregion
virtual void EndSetClipRegion() override;
- virtual sal_uIntPtr GetNativeWindowHandle() override;
-
/// @internal
void setPendingSizeEvent();
};
diff --git a/vcl/inc/unx/x11/x11cairotextrender.hxx b/vcl/inc/unx/x11/x11cairotextrender.hxx
index 666f09f8c0c9..d40d7d850a03 100644
--- a/vcl/inc/unx/x11/x11cairotextrender.hxx
+++ b/vcl/inc/unx/x11/x11cairotextrender.hxx
@@ -28,10 +28,6 @@ class X11CairoTextRender : public CairoTextRender
protected:
X11SalGraphics& mrParent;
-protected:
- size_t GetWidth() const;
- size_t GetHeight() const;
-
public:
explicit X11CairoTextRender(X11SalGraphics& rParent);
diff --git a/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx b/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
deleted file mode 100644
index 0b891de141c7..000000000000
--- a/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
+++ /dev/null
@@ -1,14 +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/.
- */
-
-#include <unx/nativewindowhandleprovider.hxx>
-
-NativeWindowHandleProvider::~NativeWindowHandleProvider() {}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index d49d932656ee..6bbbbc1bff87 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -58,30 +58,6 @@ void X11CairoTextRender::clipRegion(cairo_t* cr)
}
}
-size_t X11CairoTextRender::GetWidth() const
-{
- SalGeometryProvider *pProvider = mrParent.m_pFrame;
- if( !pProvider )
- pProvider = mrParent.m_pVDev;
-
- if( pProvider )
- return pProvider->GetWidth();
- else
- return 1;
-}
-
-size_t X11CairoTextRender::GetHeight() const
-{
- SalGeometryProvider *pProvider = mrParent.m_pFrame;
- if( !pProvider )
- pProvider = mrParent.m_pVDev;
-
- if( pProvider )
- return pProvider->GetHeight();
- else
- return 1;
-}
-
void X11CairoTextRender::releaseCairoContext(cairo_t* cr)
{
X11SalGraphics::releaseCairoContext(cr);
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f12fb2805427..4cd5d7815397 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4099,9 +4099,4 @@ void X11SalFrame::EndSetClipRegion()
}
-sal_uIntPtr X11SalFrame::GetNativeWindowHandle()
-{
- return mhWindow;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 81eb8f5466a3..c11ea9082244 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4494,11 +4494,6 @@ sal_uIntPtr GtkSalFrame::GetNativeWindowHandle(GtkWidget *pWidget)
return 0;
}
-sal_uIntPtr GtkSalFrame::GetNativeWindowHandle()
-{
- return GetNativeWindowHandle(m_pWindow);
-}
-
void GtkDragSource::set_datatransfer(const css::uno::Reference<css::datatransfer::XTransferable>& rTrans,
const css::uno::Reference<css::datatransfer::dnd::XDragSourceListener>& rListener)
{