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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 18ee9518e19a..73e1ca1fb48b 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.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 09:59:30 using: + Generated on 2020-12-07 11:30:50 using: ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -113,7 +113,6 @@ #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> -#include <vcl/NotebookBarAddonsMerger.hxx> #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -138,6 +137,7 @@ #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> +#include <vcl/notebookbar/NotebookBarAddonsMerger.hxx> #include <vcl/outdev.hxx> #include <vcl/region.hxx> #include <vcl/scopedbitmapaccess.hxx> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index e1109da50c0e..a542737da227 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -66,7 +66,7 @@ #include <scabstdlg.hxx> #include <vcl/EnumContext.hxx> -#include <vcl/notebookbar.hxx> +#include <vcl/notebookbar/notebookbar.hxx> // for mouse wheel #define MINZOOM_SLIDER 10 |