diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-05 20:58:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 13:11:54 +0100 |
| commit | 66693d82bae6c4333ac754f76550eb5f4a289b22 (patch) | |
| tree | bcb2c29b5738bbcc63de875258b4ca62fda1b913 /sw | |
| parent | cad01ea74c603affcc15a5e32f75967f6dff0f87 (diff) | |
merge FillTypeLB with SvxFillTypeBox
Change-Id: Ia6229e8cc04c88e6740a12648c50cf5efca3bbd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88067
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageStylesPanel.cxx | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 3f378ab2236e..218f9873a2d4 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.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-01 11:40:57 using: + Generated on 2020-02-05 21:00:03 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -68,6 +68,9 @@ #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.hxx> +#include <rtl/string.h> +#include <rtl/stringconcat.hxx> +#include <rtl/stringutils.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> #include <rtl/unload.h> diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index 628bc6a880ca..8ce341228c5c 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -149,7 +149,7 @@ void PageStylesPanel::dispose() void PageStylesPanel::Initialize() { - FillTypeLB::Fill(*mxBgFillType); + SvxFillTypeBox::Fill(*mxBgFillType); aCustomEntry = mxCustomEntry->get_label(); mpBindings->Invalidate(SID_ATTR_PAGE_COLUMN); |