[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/notebookbar/PriorityHBox.cxx       |    5 ++---
 sfx2/source/notebookbar/PriorityMergedHBox.cxx |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 8e3dc5b81d1a7486a6787afef918e9d2b74542ef
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 3 10:27:01 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 3 14:24:19 2020 +0100

    drop SfxViewFrame::Current() guard
    
    there doesn't seem to be a need for it in these widgets
    
    Change-Id: Id26220e348f0c29095562f69b284adabe8584a87
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107153
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx
index 3c6564aa8890..5851e51cdaf4 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
-#include <sfx2/viewfrm.hxx>
 #include "PriorityHBox.hxx"
 #include <comphelper/lok.hxx>
 
@@ -109,7 +108,7 @@ Size PriorityHBox::calculateRequisition() const
 
 void PriorityHBox::Resize()
 {
-    if (!m_bInitialized && SfxViewFrame::Current())
+    if (!m_bInitialized)
         Initialize();
 
     if (!m_bInitialized || comphelper::LibreOfficeKit::isActive())
@@ -172,7 +171,7 @@ void PriorityHBox::Resize()
 
 void PriorityHBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
-    if (!m_bInitialized && SfxViewFrame::Current())
+    if (!m_bInitialized)
         Initialize();
 
     VclHBox::Paint(rRenderContext, rRect);
diff --git a/sfx2/source/notebookbar/PriorityMergedHBox.cxx b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
index a5472f71ad7b..bb4e00b0fe52 100644
--- a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
@@ -23,7 +23,6 @@
 #include <bitmaps.hlst>
 #include "PriorityHBox.hxx"
 #include "NotebookbarPopup.hxx"
-#include <sfx2/viewfrm.hxx>
 #include <comphelper/lok.hxx>
 
 #define DUMMY_WIDTH 50
@@ -62,7 +61,7 @@ public:
         if (comphelper::LibreOfficeKit::isActive())
             return VclHBox::Resize();
 
-        if (!m_bInitialized && SfxViewFrame::Current())
+        if (!m_bInitialized)
             Initialize();
 
         if (!m_bInitialized)