diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-07 11:18:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-07 21:05:06 +0100 |
| commit | 35b5f03e41e21085b67b56e29c52dcddc9a36c30 (patch) | |
| tree | fdd93138f52d9f2f83a02fb3f54f50f23eb8732f /sw | |
| parent | a91e21b9acab16bd31dbefa4640d2e5f3c3c7d63 (diff) | |
move various notebookbar widgets into vcl
and we can drop their factories then
Change-Id: I1e261886dd7700710ba628da4bbeeba65efa1531
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107134
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 3b3021716e1a..8f50e045f78f 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.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-12-04 10:00:05 using: + Generated on 2020-12-07 11:31:25 using: ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -95,7 +95,6 @@ #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> -#include <vcl/NotebookBarAddonsMerger.hxx> #include <vcl/Scanline.hxx> #include <vcl/accessibletableprovider.hxx> #include <vcl/alpha.hxx> @@ -130,6 +129,7 @@ #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/metric.hxx> +#include <vcl/notebookbar/NotebookBarAddonsMerger.hxx> #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 038428d9290e..a873e4695419 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -67,7 +67,7 @@ #include <memory> #include <vcl/EnumContext.hxx> -#include <vcl/notebookbar.hxx> +#include <vcl/notebookbar/notebookbar.hxx> using namespace ::com::sun::star; SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview") |