diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-22 15:16:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-22 22:16:10 +0200 |
commit | a9d797ed771632afafb702697a6f31e0c25e80cf (patch) | |
tree | de806678bc02b1ee20e2593009fd5138abed1e3b /svx/source | |
parent | 19f44fe53863ef8c9087aa965b786544f71ffdc8 (diff) |
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>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/labelitemwindow.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/tbxform.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 |
4 files changed, 6 insertions, 4 deletions
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> |