diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-07 13:12:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-07 16:21:39 +0100 |
| commit | d0586b42a715e4d14eeb5b3e729f20c3fb40c391 (patch) | |
| tree | 70a837c931584799d9dd99e37857d2a341f92bc7 | |
| parent | 24dcb0b11813241c71ba4f5826abb1f89dc5a527 (diff) | |
can drop wallpaper if use alpha-enabled virdev
Change-Id: I655dca755ed8e1c1266c191f61998b3838fe9797
Reviewed-on: https://gerrit.libreoffice.org/68860
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 3 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 5 |
4 files changed, 1 insertions, 15 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 6f63cb7d45b8..703d52ddb026 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -227,10 +227,9 @@ namespace svx }; RubyRadioButton::RubyRadioButton(std::unique_ptr<weld::RadioButton> xControl) - : m_xVirDev(VclPtr<VirtualDevice>::Create()) + : m_xVirDev(VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)) , m_xControl(std::move(xControl)) { - m_xVirDev->SetBackground(m_xControl->get_wallpaper()); // expand the point size of the desired font to the equivalent pixel size if (vcl::Window* pDefaultDevice = dynamic_cast<vcl::Window*>(Application::GetDefaultDevice())) pDefaultDevice->SetPointFont(*m_xVirDev, m_xControl->get_font()); diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index e25911f940da..f0b9a6994f87 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -22,7 +22,6 @@ #include <vcl/font.hxx> #include <vcl/menu.hxx> #include <vcl/uitest/factory.hxx> -#include <vcl/wall.hxx> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -184,8 +183,6 @@ public: // font size is in points, not pixels, e.g. see Window::[G]etPointFont virtual vcl::Font get_font() = 0; - virtual Wallpaper get_wallpaper() const = 0; - //true for rtl, false otherwise virtual bool get_direction() const = 0; virtual void set_direction(bool bRTL) = 0; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 35bf1e625c6f..e732939aed78 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -387,11 +387,6 @@ public: return m_xWidget->GetPointFont(*m_xWidget); } - virtual Wallpaper get_wallpaper() const override - { - return Wallpaper(Application::GetSettings().GetStyleSettings().GetDialogColor()); - } - virtual OString get_buildable_name() const override { return m_xWidget->get_id().toUtf8(); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index a11c943ae651..7e8334d30e8f 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1599,11 +1599,6 @@ public: Application::GetSettings().GetUILanguageTag().getLocale()); } - virtual Wallpaper get_wallpaper() const override - { - return Wallpaper(COL_TRANSPARENT); - } - virtual void set_grid_left_attach(int nAttach) override { GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); |