weld form navigator label item windows

Change-Id: I2e49ffda6dc29746819a61db2848b6bcfe5f4a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 7 insertions, 35 deletions

diff --git a/svx/inc/labelitemwindow.hxx b/svx/inc/labelitemwindow.hxx
deleted file mode 100644
index 5271482b11ad..000000000000
--- a/svx/inc/labelitemwindow.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- 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 <vcl/InterimItemWindow.hxx>
-#include <svx/svxdllapi.h>
-
-class SVXCORE_DLLPUBLIC 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/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index b2ce7362b84e..0c96cace089e 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -376,7 +376,6 @@
 #include <fmprop.hxx>
 #include <fmservs.hxx>
 #include <helpids.h>
-#include <labelitemwindow.hxx>
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
@@ -401,6 +400,7 @@
 #include <svx/galmisc.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/itextprovider.hxx>
+#include <svx/labelitemwindow.hxx>
 #include <svx/numvset.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/pageitem.hxx>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 50615a73ff54..b47067a19e42 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -73,7 +73,7 @@
 
 #include <findtextfield.hxx>
 
-#include <labelitemwindow.hxx>
+#include <svx/labelitemwindow.hxx>
 #include <svx/xdef.hxx>
 #include <officecfg/Office/Common.hxx>
 
diff --git a/svx/source/form/labelitemwindow.cxx b/svx/source/form/labelitemwindow.cxx
index fb6f6220d646..77965cbd4a4e 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -7,12 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <labelitemwindow.hxx>
+#include <svx/labelitemwindow.hxx>
 
 LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const OUString& rLabel)
     : InterimItemWindow(pParent, "svx/ui/labelbox.ui", "LabelBox")
     , m_xLabel(m_xBuilder->weld_label("label"))
 {
+    InitControlBase(m_xLabel.get());
+
     m_xLabel->set_label(rLabel);
 
     SetOptimalSize();
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 1a070374f3a9..dadbb362076f 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -25,7 +25,7 @@
 #include <vcl/settings.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <labelitemwindow.hxx>
+#include <svx/labelitemwindow.hxx>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <tbxform.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e8b19f006aa9..040aaa34aa16 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -56,7 +56,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
-#include <labelitemwindow.hxx>
+#include <svx/labelitemwindow.hxx>
 #include <svx/srchdlg.hxx>
 #include <vcl/event.hxx>