[Libreoffice-commits] core.git: 2 commits - basctl/inc basctl/source include/vcl reportdesign/inc sfx2/inc svx/inc svx/source vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Feb 14 09:00:15 UTC 2020


 basctl/inc/pch/precompiled_basctl.hxx          |    4 -
 basctl/source/dlged/dlged.cxx                  |    1 
 include/vcl/layout.hxx                         |   14 +++--
 reportdesign/inc/pch/precompiled_rptui.hxx     |    3 -
 sfx2/inc/pch/precompiled_sfx.hxx               |    4 -
 svx/inc/pch/precompiled_svx.hxx                |    6 +-
 svx/inc/pch/precompiled_svxcore.hxx            |    3 -
 svx/source/dialog/srchdlg.cxx                  |   13 ++---
 svx/source/form/tbxform.cxx                    |   64 +++++++++++++------------
 svx/source/inc/labelitemwindow.hxx             |   29 +++++++++++
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   28 ++++++----
 vcl/source/window/builder.cxx                  |    1 
 vcl/source/window/layout.cxx                   |   20 +++++++
 vcl/source/window/toolbox2.cxx                 |    2 
 14 files changed, 131 insertions(+), 61 deletions(-)

New commits:
commit 1e57442fc9f275828943d316ac4b64f1d29b3f9b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 13 17:10:54 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 14 09:59:52 2020 +0100

    weld SearchLabelToolboxController
    
    and split out LabelItemWindow to reuse it
    
    Change-Id: Ie14f1bdc6d8684db088c018afd341e10bee9d977
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88623
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 2fbeb6430aac..3581e2087a00 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-13 17:41:02 using:
+ Generated on 2020-02-13 20:23:51 using:
  ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -368,6 +368,7 @@
 #include <fmservs.hxx>
 #include <fmshimp.hxx>
 #include <helpids.h>
+#include <labelitemwindow.hxx>
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 8f9cf9ed0be9..10357d49f944 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -74,6 +74,7 @@
 #include <memory>
 
 #include <findtextfield.hxx>
+#include <labelitemwindow.hxx>
 
 #include <svx/xdef.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -2400,13 +2401,13 @@ static void lcl_SetSearchLabelWindow(const OUString& rStr)
         sal_uInt16 id = pToolBox->GetItemId(i);
         if (pToolBox->GetItemCommand(id) == ".uno:SearchLabel")
         {
-            vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
+            LabelItemWindow* pSearchLabel = dynamic_cast<LabelItemWindow*>(pToolBox->GetItemWindow(id));
             assert(pSearchLabel);
-            pSearchLabel->SetText(rStr);
+            pSearchLabel->set_label(rStr);
             if (rStr.isEmpty())
-                pSearchLabel->SetSizePixel(Size(16, pSearchLabel->get_preferred_size().Height()));
+                pSearchLabel->SetSizePixel(Size(16, pSearchLabel->GetSizePixel().Height()));
             else
-                pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
+                pSearchLabel->SetOptimalSize();
         }
 
         if (pToolBox->GetItemCommand(id) == ".uno:FindText")
@@ -2445,8 +2446,8 @@ OUString SvxSearchDialogWrapper::GetSearchLabel()
         sal_uInt16 id = pToolBox->GetItemId(i);
         if (pToolBox->GetItemCommand(id) == ".uno:SearchLabel")
         {
-            vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
-            return pSearchLabel ? pSearchLabel->GetText() : OUString();
+            LabelItemWindow* pSearchLabel = dynamic_cast<LabelItemWindow*>(pToolBox->GetItemWindow(id));
+            return pSearchLabel ? pSearchLabel->get_label() : OUString();
         }
     }
     return OUString();
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 1bd90475e1cb..3d45d19519a1 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -21,12 +21,12 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <sfx2/InterimItemWindow.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 #include <formtoolbars.hxx>
+#include <labelitemwindow.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/svxids.hrc>
@@ -163,41 +163,45 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
 {
 }
 
-class LabelItemWindow final : public InterimItemWindow
+LabelItemWindow::LabelItemWindow(vcl::Window *pParent, const OUString& rLabel)
+    : InterimItemWindow(pParent, "svx/ui/labelbox.ui", "LabelBox")
+    , m_xLabel(m_xBuilder->weld_label("label"))
 {
-private:
-    std::unique_ptr<weld::Label> m_xLabel;
-public:
-    LabelItemWindow(vcl::Window *pParent, const OUString& rLabel)
-        : InterimItemWindow(pParent, "svx/ui/labelbox.ui", "LabelBox")
-        , m_xLabel(m_xBuilder->weld_label("label"))
-    {
-        m_xLabel->set_label(rLabel);
-        Size aSize(m_xLabel->get_preferred_size());
-        aSize.AdjustWidth(12);
-        m_xLabel->set_size_request(aSize.Width(), -1);
+    m_xLabel->set_label(rLabel);
 
-        SetSizePixel(m_xLabel->get_preferred_size());
+    SetOptimalSize();
 
-        m_xLabel->set_toolbar_background();
-    }
+    m_xLabel->set_toolbar_background();
+}
 
-    void set_label(const OUString& rLabel)
-    {
-        m_xLabel->set_label(rLabel);
-    }
+void LabelItemWindow::SetOptimalSize()
+{
+    Size aSize(m_xLabel->get_preferred_size());
+    aSize.AdjustWidth(12);
 
-    virtual void dispose() override
-    {
-        m_xLabel.reset();
-        InterimItemWindow::dispose();
-    }
+    SetSizePixel(aSize);
+}
 
-    virtual ~LabelItemWindow() override
-    {
-        disposeOnce();
-    }
-};
+void LabelItemWindow::set_label(const OUString& rLabel)
+{
+    m_xLabel->set_label(rLabel);
+}
+
+OUString LabelItemWindow::get_label() const
+{
+    return m_xLabel->get_label();
+}
+
+void LabelItemWindow::dispose()
+{
+    m_xLabel.reset();
+    InterimItemWindow::dispose();
+}
+
+LabelItemWindow::~LabelItemWindow()
+{
+    disposeOnce();
+}
 
 VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
 {
diff --git a/svx/source/inc/labelitemwindow.hxx b/svx/source/inc/labelitemwindow.hxx
new file mode 100644
index 000000000000..1667cdc4edc6
--- /dev/null
+++ b/svx/source/inc/labelitemwindow.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#pragma once
+
+#include <sfx2/InterimItemWindow.hxx>
+
+class LabelItemWindow final : public InterimItemWindow
+{
+private:
+    std::unique_ptr<weld::Label> m_xLabel;
+
+public:
+    LabelItemWindow(vcl::Window* pParent, const OUString& rLabel);
+    void set_label(const OUString& rLabel);
+    OUString get_label() const;
+
+    void SetOptimalSize();
+    virtual void dispose() override;
+    virtual ~LabelItemWindow() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 1c620ef7da3e..ec8f23b7f8f0 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -59,10 +59,9 @@
 #include <rtl/instance.hxx>
 #include <svx/srchdlg.hxx>
 #include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/window.hxx>
 
 #include <findtextfield.hxx>
+#include <labelitemwindow.hxx>
 
 using namespace css;
 
@@ -1300,7 +1299,7 @@ public:
     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
 private:
-    VclPtr<vcl::Window> m_pSL;
+    VclPtr<LabelItemWindow> m_xSL;
 };
 
 SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -1355,7 +1354,7 @@ void SAL_CALL SearchLabelToolboxController::dispose()
     SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame, m_aCommandURL);
 
     svt::ToolboxController::dispose();
-    m_pSL.disposeAndClear();
+    m_xSL.disposeAndClear();
 }
 
 // XInitialization
@@ -1368,20 +1367,27 @@ void SAL_CALL SearchLabelToolboxController::initialize( const css::uno::Sequence
 // XStatusListener
 void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::FeatureStateEvent& )
 {
-    if (m_pSL)
+    if (m_xSL)
     {
         OUString aStr = SvxSearchDialogWrapper::GetSearchLabel();
-        m_pSL->SetText(aStr);
-        long aWidth = !aStr.isEmpty() ? m_pSL->get_preferred_size().getWidth() : 16;
-        m_pSL->SetSizePixel(Size(aWidth, m_pSL->get_preferred_size().getHeight()));
+        m_xSL->set_label(aStr);
+        m_xSL->SetOptimalSize();
+        Size aSize(m_xSL->GetSizePixel());
+        long nWidth = !aStr.isEmpty() ? aSize.getWidth() : 16;
+        m_xSL->SetSizePixel(Size(nWidth, aSize.Height()));
     }
 }
 
 css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent )
 {
-    m_pSL = VclPtr<FixedText>::Create(VCLUnoHelper::GetWindow( Parent ));
-    m_pSL->SetSizePixel(Size(16, 25));
-    return VCLUnoHelper::GetInterface(m_pSL);
+    ToolBox* pToolBox = nullptr;
+    sal_uInt16 nId = 0;
+    if (getToolboxId(nId, &pToolBox))
+        pToolBox->SetItemWindowNonInteractive(nId, true);
+
+    m_xSL = VclPtr<LabelItemWindow>::Create(VCLUnoHelper::GetWindow(Parent), "");
+    m_xSL->SetSizePixel(Size(16, m_xSL->GetSizePixel().Height()));
+    return VCLUnoHelper::GetInterface(m_xSL);
 }
 
 // protocol handler for "vnd.sun.star.findbar:*" URLs
commit 832a120473ff352cd4e3f2c0486c8718806cb2aa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 13 17:36:53 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 14 09:59:36 2020 +0100

    don't need to include split.hxx or scrbar.hxx
    
    Change-Id: I775e77a0f303d66ca571e1851205b8286c840bc9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88631
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 4e043ce70aa5..0eb4b291f5b4 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-12 16:02:54 using:
+ Generated on 2020-02-13 17:41:51 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -151,9 +151,7 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/split.hxx>
 #include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 7310ed31bee6..771823a2895d 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -43,6 +43,7 @@
 #include <svx/svdpagv.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/print.hxx>
+#include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <xmlscript/xml_helper.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index c7631e1308cb..8a70f69fe7f6 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -11,9 +11,8 @@
 #define INCLUDED_VCL_LAYOUT_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/ctrl.hxx>
 #include <vcl/help.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
@@ -24,6 +23,11 @@
 #include <vcl/commandevent.hxx>
 #include <set>
 
+class ScrollBar;
+class ScrollBar;
+class ScrollBarBox;
+class Splitter;
+
 class VCL_DLLPUBLIC VclContainer : public vcl::Window,
                                    public vcl::IContext
 {
@@ -378,7 +382,7 @@ protected:
 
     VclPaned(vcl::Window *pParent, bool bVertical);
 public:
-    virtual ~VclPaned() override { disposeOnce(); }
+    virtual ~VclPaned() override;
     virtual void dispose() override;
     long get_position() const { return m_nPosition; }
     void set_position(long nPosition) { m_nPosition = nPosition; }
@@ -392,6 +396,7 @@ private:
 
 public:
     VclVPaned(vcl::Window *pParent);
+    virtual ~VclVPaned() override;
     virtual Size calculateRequisition() const override;
     virtual void setAllocation(const Size &rAllocation) override;
 };
@@ -404,6 +409,7 @@ private:
 
 public:
     VclHPaned(vcl::Window *pParent);
+    virtual ~VclHPaned() override;
     virtual Size calculateRequisition() const override;
     virtual void setAllocation(const Size &rAllocation) override;
 };
@@ -488,7 +494,7 @@ class VCL_DLLPUBLIC VclScrolledWindow final : public VclBin
 {
 public:
     VclScrolledWindow(vcl::Window *pParent );
-    virtual ~VclScrolledWindow() override { disposeOnce(); }
+    virtual ~VclScrolledWindow() override;
     virtual void dispose() override;
     virtual vcl::Window *get_child() override;
     virtual const vcl::Window *get_child() const override;
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 4c865cefd4e8..6060869edb98 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-05 20:46:59 using:
+ Generated on 2020-02-13 17:42:29 using:
  ./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -144,7 +144,6 @@
 #include <vcl/region.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 2dfbc7c548f0..efa6a446c846 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-06 17:39:06 using:
+ Generated on 2020-02-13 17:43:02 using:
  ./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -51,7 +51,6 @@
 #include <osl/diagnose.h>
 #include <osl/endian.h>
 #include <osl/file.hxx>
-#include <osl/interlck.h>
 #include <osl/module.hxx>
 #include <osl/mutex.hxx>
 #include <osl/process.h>
@@ -393,6 +392,7 @@
 #include <openflag.hxx>
 #include <openuriexternally.hxx>
 #include <openurlhint.hxx>
+#include <sfx2/InterimItemWindow.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 01e7c0c20563..2fbeb6430aac 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-13 15:12:26 using:
+ Generated on 2020-02-13 17:41:02 using:
  ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -72,6 +72,7 @@
 #include <vcl/BitmapFilter.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/GraphicObject.hxx>
+#include <vcl/IContext.hxx>
 #include <vcl/Scanline.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
@@ -89,10 +90,12 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/help.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
 #include <vcl/imap.hxx>
 #include <vcl/imapobj.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 8efd27097cac..5262f52a3f04 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-13 17:01:33 using:
+ Generated on 2020-02-13 17:41:00 using:
  ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -141,7 +141,6 @@
 #include <vcl/quickselectionengine.hxx>
 #include <vcl/region.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 87cbd5eef9c0..3cf4cccef262 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -38,6 +38,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/svtabbx.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index cddd8f5519fd..75a6171f5b50 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -14,7 +14,9 @@
 #include <vcl/decoview.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/scrbar.hxx>
 #include <vcl/stdtext.hxx>
+#include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <messagedialog.hxx>
@@ -2736,4 +2738,22 @@ void VclDrawingArea::StartDrag(sal_Int8, const Point&)
     xContainer->StartDrag(this, m_nDragAction);
 }
 
+VclHPaned::~VclHPaned()
+{
+}
+
+VclVPaned::~VclVPaned()
+{
+}
+
+VclPaned::~VclPaned()
+{
+    disposeOnce();
+}
+
+VclScrolledWindow::~VclScrolledWindow()
+{
+    disposeOnce();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 68cf9a383085..1136e35442ff 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -881,10 +881,12 @@ void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits )
 
 void ToolBox::SetItemWindowNonInteractive(sal_uInt16 nItemId, bool bNonInteractive)
 {
+    fprintf(stderr, "attempt\n");
     ImplToolItems::size_type nPos = GetItemPos( nItemId );
 
     if ( nPos < GetItemCount() )
     {
+        fprintf(stderr, "success\n");
         mpData->m_aItems[nPos].mbNonInteractiveWindow = bNonInteractive;
     }
 }


More information about the Libreoffice-commits mailing list