diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-10-31 12:16:30 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-04 09:50:22 +0100 |
commit | fa7f07d23de31e5f1660a643d83ca8a2e565f69c (patch) | |
tree | 07bce01b84e43588f74720a6fa3f48207aadb333 | |
parent | tdf#120315 DOCX import: fix cells merged vertically (diff) | |
download | core-fa7f07d23de31e5f1660a643d83ca8a2e565f69c.tar.gz core-fa7f07d23de31e5f1660a643d83ca8a2e565f69c.zip |
Fix build with --disable-pch on Win
Broken after commit 2cd6ff8a54b0db76b2f4c5f75988367cfb0feaf0
- apparently vcl/svapp.hxx is needed
Most of sfx2/source/appl/appdde.cxx is Windows specific so
took the opportunity to clean it up with IWYU and commenting out
ifdefs
Change-Id: Ia0ad54f590cf19033e630ea4df98c244bfdc47a0
Reviewed-on: https://gerrit.libreoffice.org/81849
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r-- | sfx2/IwyuFilter_sfx2.yaml | 26 | ||||
-rw-r--r-- | sfx2/source/appl/appdde.cxx | 10 |
2 files changed, 28 insertions, 8 deletions
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml new file mode 100644 index 000000000000..7a26362937ad --- /dev/null +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -0,0 +1,26 @@ +--- +assumeFilename: sfx2/source/appl/app.cxx +blacklist: + sfx2/source/appl/appdde.cxx: + # Needed on WIN32 + - config_features.h + - rtl/character.hxx + - rtl/malformeduriexception.hxx + - rtl/uri.hxx + - sot/exchange.hxx + - svl/eitem.hxx + - basic/sbstar.hxx + - svl/stritem.hxx + - sfx2/lnkbase.hxx + - sfx2/linkmgr.hxx + - tools/debug.hxx + - tools/urlobj.hxx + - tools/diagnose_ex.h + - unotools/pathoptions.hxx + - vcl/svapp.hxx + - sfx2/viewfrm.hxx + - sfx2/dispatch.hxx + - sfx2/sfxsids.hrc + - sfx2/docfile.hxx + - ucbhelper/content.hxx + - comphelper/processfactory.hxx diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 9c87c2b98093..a65f087d9e26 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -21,35 +21,29 @@ #include <rtl/character.hxx> #include <rtl/malformeduriexception.hxx> #include <rtl/uri.hxx> -#include <sal/log.hxx> #include <sot/exchange.hxx> -#include <svl/rectitem.hxx> #include <svl/eitem.hxx> -#include <svl/intitem.hxx> #include <basic/sbstar.hxx> #include <svl/stritem.hxx> #include <svl/svdde.hxx> #include <sfx2/lnkbase.hxx> #include <sfx2/linkmgr.hxx> +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <unotools/pathoptions.hxx> +#include <vcl/svapp.hxx> #include <sfx2/app.hxx> #include <appdata.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <sfxtypes.hxx> #include <sfx2/sfxsids.hrc> -#include <helper.hxx> #include <sfx2/docfile.hxx> #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/ucb/IllegalIdentifierException.hpp> -#include <com/sun/star/ucb/ContentCreationException.hpp> #if defined(_WIN32) |