diff options
89 files changed, 129 insertions, 119 deletions
diff --git a/compilerplugins/clang/store/deletedspecial.cxx b/compilerplugins/clang/store/deletedspecial.cxx index 7ee75bb319d0..bb6eb5cc6c43 100644 --- a/compilerplugins/clang/store/deletedspecial.cxx +++ b/compilerplugins/clang/store/deletedspecial.cxx @@ -117,7 +117,7 @@ bool DeletedSpecial::VisitCXXMethodDecl(CXXMethodDecl const * decl) { || whitelist(decl, "sd::RemoteServer", "sd/source/ui/inc/RemoteServer.hxx") || whitelist(decl, "sd::slidesorter::cache::PageCacheManager", "sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx") || whitelist(decl, "framework::CommandInfoProvider", "include/framework/commandinfoprovider.hxx") - || whitelist(decl, "vcl::SettingsConfigItem", "include/vcl/configsettings.hxx") + || whitelist(decl, "vcl::SettingsConfigItem", "vcl/inc/configsettings.hxx") || whitelist(decl, "writerfilter::ooxml::OOXMLFactory", "writerfilter/source/ooxml/OOXMLFactory.hxx")) { return true; diff --git a/editeng/IwyuFilter_editeng.yaml b/editeng/IwyuFilter_editeng.yaml index 8881e16fc348..49728f5531f7 100644 --- a/editeng/IwyuFilter_editeng.yaml +++ b/editeng/IwyuFilter_editeng.yaml @@ -10,6 +10,13 @@ blacklist: editeng/source/accessibility/AccessibleEditableTextPara.cxx: # Needed for macro defines - editeng/unoprnms.hxx + editeng/source/accessibility/AccessibleImageBullet.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessibleComponent.hpp + - com/sun/star/accessibility/XAccessibleContext.hpp + - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp + - com/sun/star/accessibility/XAccessible.hpp + - com/sun/star/lang/XServiceInfo.hpp editeng/source/items/CustomPropertyField.cxx: # Actually used - com/sun/star/document/XDocumentProperties.hpp diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 297dbeef018c..a5cbdc97447b 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -49,7 +49,6 @@ #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> -#include <editeng/AccessibleImageBullet.hxx> #include <editeng/editeng.hxx> #include <editeng/unoprnms.hxx> #include <editeng/unoipset.hxx> @@ -67,6 +66,7 @@ #include <editeng/unopracc.hxx> #include <editeng/AccessibleEditableTextPara.hxx> #include "AccessibleHyperlink.hxx" +#include "AccessibleImageBullet.hxx" #include <svtools/colorcfg.hxx> using namespace std; diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index f3e4aa9faa2e..63120433f256 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -33,7 +33,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <i18nlangtag/languagetag.hxx> #include <editeng/AccessibleEditableTextPara.hxx> -#include <editeng/AccessibleImageBullet.hxx> #include <editeng/eerdll.hxx> #include <editeng/editdata.hxx> @@ -42,6 +41,7 @@ #include <editeng/unoedsrc.hxx> #include <svtools/colorcfg.hxx> +#include "AccessibleImageBullet.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/include/editeng/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index b09e393cbae0..b09e393cbae0 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 85507711eb80..2d6ddd53b60f 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -317,9 +317,6 @@ blacklist: - com/sun/star/frame/XTerminateListener.hpp - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp - include/vcl/vclstatuslistener.hxx: - # base class has to be a complete type - - com/sun/star/frame/XStatusListener.hpp include/vcl/weld.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessibleRelationSet.hpp @@ -502,13 +499,6 @@ blacklist: - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp - com/sun/star/xml/sax/XFastDocumentHandler.hpp - com/sun/star/xml/sax/XFastParser.hpp - include/svtools/accessibleruler.hxx: - # base class has to be a complete type - - com/sun/star/accessibility/XAccessible.hpp - - com/sun/star/accessibility/XAccessibleComponent.hpp - - com/sun/star/accessibility/XAccessibleContext.hpp - - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp - - com/sun/star/lang/XServiceInfo.hpp include/svtools/asynclink.hxx: # unique_ptr needs complete type - osl/mutex.hxx @@ -701,9 +691,6 @@ blacklist: include/drawinglayer/primitive3d/baseprimitive3d.hxx: # base class has to be a complete type - com/sun/star/graphic/XPrimitive3D.hpp - include/sfx2/asyncfunc.hxx: - # base class has to be a complete type - - com/sun/star/lang/XUnoTunnel.hpp include/sfx2/charwin.hxx: # Needed for implicit dtor - vcl/virdev.hxx @@ -839,13 +826,6 @@ blacklist: - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp - com/sun/star/accessibility/XAccessible.hpp - com/sun/star/lang/XServiceInfo.hpp - include/editeng/AccessibleImageBullet.hxx: - # base class has to be a complete type - - com/sun/star/accessibility/XAccessibleComponent.hpp - - com/sun/star/accessibility/XAccessibleContext.hpp - - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp - - com/sun/star/accessibility/XAccessible.hpp - - com/sun/star/lang/XServiceInfo.hpp include/editeng/AccessibleEditableTextPara.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessibleComponent.hpp diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml index 2b2410d03d55..ddb3efcaa2ba 100644 --- a/sfx2/IwyuFilter_sfx2.yaml +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -95,6 +95,9 @@ blacklist: sfx2/source/doc/sfxbasemodel.cxx: # Don't propose hxx -> h change in URE libs - cppuhelper/interfacecontainer.hxx + sfx2/source/inc/asyncfunc.hxx: + # base class has to be a complete type + - com/sun/star/lang/XUnoTunnel.hpp sfx2/source/sidebar/ControllerFactory.cxx: # Actually used - com/sun/star/frame/XFrame.hpp diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 409e197d01b2..0c147a9d3d0d 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.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:31 using: + Generated on 2020-02-03 10:51:07 using: ./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -383,6 +383,7 @@ #include <appbaslib.hxx> #include <appdata.hxx> #include <appopen.hxx> +#include <asyncfunc.hxx> #include <childwinimpl.hxx> #include <ctrlfactoryimpl.hxx> #include <eventsupplier.hxx> @@ -395,7 +396,6 @@ #include <openuriexternally.hxx> #include <openurlhint.hxx> #include <sfx2/app.hxx> -#include <sfx2/asyncfunc.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/childwin.hxx> diff --git a/sfx2/source/control/asyncfunc.cxx b/sfx2/source/control/asyncfunc.cxx index fe25e3749132..b81639af5646 100644 --- a/sfx2/source/control/asyncfunc.cxx +++ b/sfx2/source/control/asyncfunc.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sfx2/asyncfunc.hxx> +#include <asyncfunc.hxx> AsyncFunc::AsyncFunc(const std::function<void()>& rAsyncFunc) : m_pAsyncFunc(rAsyncFunc) diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index e06ea3b4e15b..d703530ad23c 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -45,7 +45,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/hintpost.hxx> +#include <hintpost.hxx> #include <sfx2/ipclient.hxx> #include <sfx2/module.hxx> #include <sfx2/msg.hxx> diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 4eaa6ae4de64..5367fe718833 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -20,7 +20,6 @@ #include <sal/log.hxx> #include <comphelper/base64.hxx> #include <sfx2/recentdocsview.hxx> -#include <sfx2/recentdocsviewitem.hxx> #include <sfx2/sfxresid.hxx> #include <tools/diagnose_ex.h> #include <unotools/historyoptions.hxx> @@ -39,6 +38,7 @@ #include <sfx2/strings.hrc> #include <bitmaps.hlst> #include <vcl/virdev.hxx> +#include "recentdocsviewitem.hxx" #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index 42af6f7527e9..26a281be5e26 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sfx2/recentdocsviewitem.hxx> - #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx> @@ -24,6 +22,7 @@ #include <vcl/ptrstyle.hxx> #include <bitmaps.hlst> +#include "recentdocsviewitem.hxx" using namespace basegfx; using namespace com::sun::star; diff --git a/include/sfx2/recentdocsviewitem.hxx b/sfx2/source/control/recentdocsviewitem.hxx index 5f88f4170cae..5f88f4170cae 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/sfx2/source/control/recentdocsviewitem.hxx diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index bb377b4f0ac0..f91ec15f8d51 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -54,7 +54,6 @@ #include <vcl/timer.hxx> #include <vcl/settings.hxx> -#include <sfx2/securitypage.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/frame.hxx> #include <sfx2/filedlghelper.hxx> @@ -69,6 +68,7 @@ #include <sfx2/strings.hrc> #include <strings.hxx> #include <tools/diagnose_ex.h> +#include "securitypage.hxx" #include <algorithm> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 978bea6cf437..f924b41ac96d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -29,7 +29,6 @@ #include <sfx2/styledlg.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/app.hxx> -#include <sfx2/mgetempl.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/module.hxx> @@ -40,6 +39,8 @@ #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> +#include "mgetempl.hxx" + /* SfxManageStyleSheetPage Constructor * * initializes the list box with the templates diff --git a/include/sfx2/mgetempl.hxx b/sfx2/source/dialog/mgetempl.hxx index 26a1a32ca69c..26a1a32ca69c 100644 --- a/include/sfx2/mgetempl.hxx +++ b/sfx2/source/dialog/mgetempl.hxx diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 2e673538d913..6268e10e7607 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -18,7 +18,6 @@ */ #include <sfx2/htmlmode.hxx> -#include <sfx2/securitypage.hxx> #include <sfx2/sfxresid.hxx> @@ -37,6 +36,8 @@ #include <sfx2/strings.hrc> +#include "securitypage.hxx" + using namespace ::com::sun::star; namespace diff --git a/include/sfx2/securitypage.hxx b/sfx2/source/dialog/securitypage.hxx index b4ca1ddac5c5..b4ca1ddac5c5 100644 --- a/include/sfx2/securitypage.hxx +++ b/sfx2/source/dialog/securitypage.hxx diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 700f44e5e3ec..e86f63f9ef53 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -21,11 +21,11 @@ #include <svl/style.hxx> #include <sfx2/styledlg.hxx> -#include <sfx2/mgetempl.hxx> #include <sfx2/sfxresid.hxx> - #include <sfx2/strings.hrc> +#include "mgetempl.hxx" + /* [Description] Constructor: Add Manage TabPage, set ExampleSet from style. diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6c06bfaea8b5..e42cf63c13f6 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -69,7 +69,7 @@ #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/asyncfunc.hxx> +#include <asyncfunc.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxuno.hxx> #include <alienwarn.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6b97b0befef7..275edbea273d 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -60,7 +60,7 @@ #include <comphelper/storagehelper.hxx> #include <tools/link.hxx> -#include <sfx2/asyncfunc.hxx> +#include <asyncfunc.hxx> #include <sfx2/signaturestate.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/request.hxx> diff --git a/include/sfx2/asyncfunc.hxx b/sfx2/source/inc/asyncfunc.hxx index 7d4f409b86b3..7d4f409b86b3 100644 --- a/include/sfx2/asyncfunc.hxx +++ b/sfx2/source/inc/asyncfunc.hxx diff --git a/include/sfx2/hintpost.hxx b/sfx2/source/inc/hintpost.hxx index 0a72aa661446..0a72aa661446 100644 --- a/include/sfx2/hintpost.hxx +++ b/sfx2/source/inc/hintpost.hxx diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index 54949d07efda..44b26b52ae7a 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/hintpost.hxx> +#include <hintpost.hxx> #include <sfx2/request.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 4721ff052118..7b774534951a 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -22,9 +22,9 @@ #include <utility> #include <sfx2/printer.hxx> -#include <sfx2/prnmon.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/tabdlg.hxx> +#include "prnmon.hxx" // class SfxPrinter ------------------------------------------------------ diff --git a/include/sfx2/prnmon.hxx b/sfx2/source/view/prnmon.hxx index 665d3ac07630..665d3ac07630 100644 --- a/include/sfx2/prnmon.hxx +++ b/sfx2/source/view/prnmon.hxx diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 339766ef53ab..ffb0b568ec7b 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -41,7 +41,6 @@ #include "viewimp.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/printer.hxx> -#include <sfx2/prnmon.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> @@ -55,6 +54,8 @@ #include <toolkit/awt/vclxdevice.hxx> +#include "prnmon.hxx" + using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 95c33b3618d0..219f02652113 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -3965,6 +3965,7 @@ editeng/source/accessibility/AccessibleContextBase.cxx editeng/source/accessibility/AccessibleEditableTextPara.cxx editeng/source/accessibility/AccessibleHyperlink.cxx editeng/source/accessibility/AccessibleHyperlink.hxx +editeng/source/accessibility/AccessibleImageBullet.hxx editeng/source/accessibility/AccessibleImageBullet.cxx editeng/source/accessibility/AccessibleParaManager.cxx editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -6142,7 +6143,6 @@ include/drawinglayer/tools/primitive2dxmldump.hxx include/editeng/AccessibleComponentBase.hxx include/editeng/AccessibleContextBase.hxx include/editeng/AccessibleEditableTextPara.hxx -include/editeng/AccessibleImageBullet.hxx include/editeng/AccessibleParaManager.hxx include/editeng/AccessibleSelectionBase.hxx include/editeng/AccessibleStaticTextBase.hxx @@ -6658,7 +6658,6 @@ include/sfx2/frmdescr.hxx include/sfx2/frmhtml.hxx include/sfx2/frmhtmlw.hxx include/sfx2/groupid.hxx -include/sfx2/hintpost.hxx include/sfx2/htmlmode.hxx include/sfx2/inputdlg.hxx include/sfx2/ipclient.hxx @@ -6668,7 +6667,6 @@ include/sfx2/lnkbase.hxx include/sfx2/lokcharthelper.hxx include/sfx2/lokhelper.hxx include/sfx2/mailmodelapi.hxx -include/sfx2/mgetempl.hxx include/sfx2/mieclip.hxx include/sfx2/minfitem.hxx include/sfx2/module.hxx @@ -6687,13 +6685,10 @@ include/sfx2/pageids.hxx include/sfx2/passwd.hxx include/sfx2/printer.hxx include/sfx2/printopt.hxx -include/sfx2/prnmon.hxx include/sfx2/progress.hxx include/sfx2/recentdocsview.hxx -include/sfx2/recentdocsviewitem.hxx include/sfx2/request.hxx include/sfx2/safemode.hxx -include/sfx2/securitypage.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/sfx2/sfxdlg.hxx @@ -6862,10 +6857,8 @@ include/svtools/DocumentInfoPreview.hxx include/svtools/DocumentToGraphicRenderer.hxx include/svtools/HtmlWriter.hxx include/svtools/PlaceEditDialog.hxx -include/svtools/ServerDetailsControls.hxx include/svtools/acceleratorexecute.hxx include/svtools/accessibilityoptions.hxx -include/svtools/accessibleruler.hxx include/svtools/addresstemplate.hxx include/svtools/apearcfg.hxx include/svtools/asynclink.hxx @@ -6964,7 +6957,6 @@ include/svx/ActionDescriptionProvider.hxx include/svx/AffineMatrixItem.hxx include/svx/ChildrenManager.hxx include/svx/ClassificationDialog.hxx -include/svx/ClassificationEditView.hxx include/svx/ClassificationField.hxx include/svx/ColorSets.hxx include/svx/CommonStyleManager.hxx @@ -7405,7 +7397,6 @@ include/test/callgrind.hxx include/test/container/xnamed.hxx include/test/htmltesttools.hxx include/test/screenshot_test.hxx -include/test/setupvcl.hxx include/test/sheet/cellproperties.hxx include/test/sheet/databaserange.hxx include/test/sheet/datapilotfield.hxx @@ -7709,8 +7700,6 @@ include/vcl/IDialogRenderable.hxx include/vcl/IPrioritable.hxx include/vcl/ITiledRenderable.hxx include/vcl/IconThemeInfo.hxx -include/vcl/IconThemeScanner.hxx -include/vcl/IconThemeSelector.hxx include/vcl/ImageTree.hxx include/vcl/NotebookbarContextControl.hxx include/vcl/Scanline.hxx @@ -7733,12 +7722,10 @@ include/vcl/checksum.hxx include/vcl/combobox.hxx include/vcl/commandevent.hxx include/vcl/commandinfoprovider.hxx -include/vcl/configsettings.hxx include/vcl/controllayout.hxx include/vcl/ctrl.hxx include/vcl/cursor.hxx include/vcl/cvtgrf.hxx -include/vcl/debugevent.hxx include/vcl/decoview.hxx include/vcl/devicecoordinate.hxx include/vcl/dialog.hxx @@ -7777,7 +7764,6 @@ include/vcl/help.hxx include/vcl/i18nhelp.hxx include/vcl/idle.hxx include/vcl/image.hxx -include/vcl/imagerepository.hxx include/vcl/imap.hxx include/vcl/imapcirc.hxx include/vcl/imapobj.hxx @@ -7788,7 +7774,6 @@ include/vcl/inputctx.hxx include/vcl/inputtypes.hxx include/vcl/introwin.hxx include/vcl/ivctrl.hxx -include/vcl/jobdata.hxx include/vcl/jobset.hxx include/vcl/keycod.hxx include/vcl/keycodes.hxx @@ -7808,7 +7793,6 @@ include/vcl/mnemonicengine.hxx include/vcl/mtfxmldump.hxx include/vcl/notebookbar.hxx include/vcl/oldprintadaptor.hxx -include/vcl/opengl/GLMHelper.hxx include/vcl/opengl/OpenGLContext.hxx include/vcl/opengl/OpenGLHelper.hxx include/vcl/opengl/OpenGLWrapper.hxx @@ -7820,7 +7804,6 @@ include/vcl/pdfwriter.hxx include/vcl/pngread.hxx include/vcl/pngwrite.hxx include/vcl/popupmenuwindow.hxx -include/vcl/ppdparser.hxx include/vcl/print.hxx include/vcl/prntypes.hxx include/vcl/ptrstyle.hxx @@ -7841,7 +7824,6 @@ include/vcl/split.hxx include/vcl/splitwin.hxx include/vcl/status.hxx include/vcl/stdtext.hxx -include/vcl/strhelper.hxx include/vcl/svapp.hxx include/vcl/svlbitm.hxx include/vcl/svmain.hxx @@ -7891,7 +7873,6 @@ include/vcl/vclmain.hxx include/vcl/vclmedit.hxx include/vcl/vclptr.hxx include/vcl/vclreferencebase.hxx -include/vcl/vclstatuslistener.hxx include/vcl/vectorgraphicdata.hxx include/vcl/viewdataentry.hxx include/vcl/virdev.hxx @@ -12621,6 +12602,7 @@ sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/recentdocsview.cxx sfx2/source/control/recentdocsviewitem.cxx +sfx2/source/control/recentdocsviewitem.hxx sfx2/source/control/request.cxx sfx2/source/control/sfxstatuslistener.cxx sfx2/source/control/shell.cxx @@ -12655,6 +12637,7 @@ sfx2/source/dialog/filtergrouping.hxx sfx2/source/dialog/inputdlg.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mgetempl.cxx +sfx2/source/dialog/mgetempl.hxx sfx2/source/dialog/navigat.cxx sfx2/source/dialog/newstyle.cxx sfx2/source/dialog/partwnd.cxx @@ -12662,6 +12645,7 @@ sfx2/source/dialog/passwd.cxx sfx2/source/dialog/printopt.cxx sfx2/source/dialog/recfloat.cxx sfx2/source/dialog/securitypage.cxx +sfx2/source/dialog/securitypage.hxx sfx2/source/dialog/sfxdlg.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/srchdlg.cxx @@ -12731,6 +12715,7 @@ sfx2/source/inc/eventsupplier.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/helper.hxx sfx2/source/inc/helpids.h +sfx2/source/inc/hintpost.hxx sfx2/source/inc/itemdel.hxx sfx2/source/inc/macroloader.hxx sfx2/source/inc/nochaos.hxx @@ -12820,6 +12805,7 @@ sfx2/source/view/ipclient.cxx sfx2/source/view/lokcharthelper.cxx sfx2/source/view/lokhelper.cxx sfx2/source/view/printer.cxx +sfx2/source/view/prnmon.hxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/userinputinterception.cxx sfx2/source/view/viewfac.cxx @@ -13625,6 +13611,7 @@ svtools/source/contnr/DocumentInfoPreview.cxx svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx svtools/source/control/accessibleruler.cxx +svtools/source/control/accessibleruler.hxx svtools/source/control/asynclink.cxx svtools/source/control/calendar.cxx svtools/source/control/collatorres.cxx @@ -13644,6 +13631,7 @@ svtools/source/control/valueimp.hxx svtools/source/control/valueset.cxx svtools/source/dialogs/PlaceEditDialog.cxx svtools/source/dialogs/ServerDetailsControls.cxx +svtools/source/dialogs/ServerDetailsControls.hxx svtools/source/dialogs/addresstemplate.cxx svtools/source/dialogs/colrdlg.cxx svtools/source/dialogs/insdlg.cxx @@ -13882,6 +13870,7 @@ svx/source/customshapes/EnhancedCustomShapeHandle.hxx svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx svx/source/dialog/ClassificationDialog.cxx svx/source/dialog/ClassificationEditView.cxx +svx/source/dialog/ClassificationEditView.hxx svx/source/dialog/SafeModeDialog.cxx svx/source/dialog/SafeModeDialog.hxx svx/source/dialog/SafeModeUI.cxx @@ -16286,6 +16275,7 @@ test/source/htmltesttools.cxx test/source/isheadless.hxx test/source/screenshot_test.cxx test/source/setupvcl.cxx +test/source/setupvcl.hxx test/source/sheet/cellproperties.cxx test/source/sheet/databaserange.cxx test/source/sheet/datapilotfield.cxx @@ -17161,6 +17151,8 @@ vcl/inc/BitmapScaleConvolutionFilter.hxx vcl/inc/BitmapScaleSuperFilter.hxx vcl/inc/BitmapSymmetryCheck.hxx vcl/inc/ControlCacheKey.hxx +vcl/inc/IconThemeScanner.hxx +vcl/inc/IconThemeSelector.hxx vcl/inc/PhysicalFontCollection.hxx vcl/inc/PhysicalFontFace.hxx vcl/inc/PhysicalFontFamily.hxx @@ -17173,7 +17165,9 @@ vcl/inc/android/svsys.h vcl/inc/bmpfast.hxx vcl/inc/brdwin.hxx vcl/inc/canvasbitmap.hxx +vcl/inc/configsettings.hxx vcl/inc/controldata.hxx +vcl/inc/debugevent.hxx vcl/inc/dbggui.hxx vcl/inc/displayconnectiondispatch.hxx vcl/inc/dndeventdispatcher.hxx @@ -17198,6 +17192,7 @@ vcl/inc/helpwin.hxx vcl/inc/hyperlabel.hxx vcl/inc/iconview.hxx vcl/inc/image.h +vcl/inc/imagerepository.hxx vcl/inc/impanmvw.hxx vcl/inc/impdel.hxx vcl/inc/impfont.hxx @@ -17208,6 +17203,7 @@ vcl/inc/impgraph.hxx vcl/inc/implimagetree.hxx vcl/inc/ios/iosinst.hxx vcl/inc/ios/svsys.h +vcl/inc/jobdata.hxx vcl/inc/jobset.h vcl/inc/langboost.hxx vcl/inc/listbox.hxx @@ -17260,6 +17256,7 @@ vcl/inc/outdata.hxx vcl/inc/outdev.h vcl/inc/pch/precompiled_vcl.cxx vcl/inc/pch/precompiled_vcl.hxx +vcl/inc/ppdparser.hxx vcl/inc/print.h vcl/inc/printdlg.hxx vcl/inc/printerinfomanager.hxx @@ -17297,6 +17294,7 @@ vcl/inc/scrwnd.hxx vcl/inc/sft.hxx vcl/inc/slider.hxx vcl/inc/spin.hxx +vcl/inc/strhelper.hxx vcl/inc/strings.hxx vcl/inc/svdata.hxx vcl/inc/svimpbox.hxx @@ -17494,6 +17492,7 @@ vcl/inc/unx/x11_cursors/wsshow_curs.h vcl/inc/unx/x11_cursors/wsshow_mask.h vcl/inc/vcleventlisteners.hxx vcl/inc/vclpluginapi.h +vcl/inc/vclstatuslistener.hxx vcl/inc/wall2.hxx vcl/inc/win/DWriteTextRenderer.hxx vcl/inc/win/salbmp.h @@ -17838,6 +17837,7 @@ vcl/source/image/ImageRepository.cxx vcl/source/image/ImageTree.cxx vcl/source/image/ImplImage.cxx vcl/source/image/ImplImageTree.cxx +vcl/source/opengl/GLMHelper.hxx vcl/source/opengl/OpenGLContext.cxx vcl/source/opengl/OpenGLHelper.cxx vcl/source/outdev/bitmap.cxx diff --git a/svtools/IwyuFilter_svtools.yaml b/svtools/IwyuFilter_svtools.yaml index 9cc69c4f10fa..c78dc720f08f 100644 --- a/svtools/IwyuFilter_svtools.yaml +++ b/svtools/IwyuFilter_svtools.yaml @@ -1,6 +1,13 @@ --- assumeFilename: svtools/source/control/ruler.cxx blacklist: + svtools/source/control/accessibleruler.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessible.hpp + - com/sun/star/accessibility/XAccessibleComponent.hpp + - com/sun/star/accessibility/XAccessibleContext.hpp + - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp + - com/sun/star/lang/XServiceInfo.hpp svtools/source/dialogs/insdlg.cxx: # Needed on WIN - comphelper/classids.hxx diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 780f088e7812..cfd54364e3ae 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/accessibleruler.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> #include <unotools/accessiblestatesethelper.hxx> @@ -29,6 +28,7 @@ #include <tools/gen.hxx> #include <svtools/ruler.hxx> +#include "accessibleruler.hxx" using namespace ::cppu; using namespace ::osl; diff --git a/include/svtools/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index c26cf96fa239..c26cf96fa239 100644 --- a/include/svtools/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index cee1ca0e70bb..a4f30d9c97a7 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -26,11 +26,11 @@ #include <vcl/ptrstyle.hxx> #include <sal/log.hxx> -#include <svtools/accessibleruler.hxx> #include <svtools/ruler.hxx> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> #include <svtools/colorcfg.hxx> +#include "accessibleruler.hxx" #include <memory> #include <vector> diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index b832bd608e6b..deaea90b0d7b 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -10,7 +10,6 @@ #include <config_oauth2.h> #include <svtools/PlaceEditDialog.hxx> -#include <svtools/ServerDetailsControls.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <officecfg/Office/Common.hxx> @@ -18,6 +17,8 @@ #include <svtools/strings.hrc> #include <svtools/place.hxx> +#include "ServerDetailsControls.hxx" + using namespace com::sun::star::uno; PlaceEditDialog::PlaceEditDialog(weld::Window* pParent) diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 0f95e7fc3d40..339704dc6fc2 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -24,10 +24,10 @@ #include <tools/diagnose_ex.h> #include <svtools/PlaceEditDialog.hxx> -#include <svtools/ServerDetailsControls.hxx> - #include <config_oauth2.h> +#include "ServerDetailsControls.hxx" + using namespace std; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; diff --git a/include/svtools/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx index 3bc5fccc530a..3bc5fccc530a 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/svtools/source/dialogs/ServerDetailsControls.hxx diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 596fc56cae47..3d0f3dc8cdc8 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -10,7 +10,6 @@ #include <svx/ClassificationDialog.hxx> #include <svx/ClassificationCommon.hxx> -#include <svx/ClassificationEditView.hxx> #include <editeng/flditem.hxx> #include <editeng/eeitem.hxx> @@ -31,6 +30,8 @@ #include <officecfg/Office/Common.hxx> +#include "ClassificationEditView.hxx" + namespace svx { IMPL_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, rKeyEvent, bool) diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx index 1099c4337666..e7e80f58c356 100644 --- a/svx/source/dialog/ClassificationEditView.cxx +++ b/svx/source/dialog/ClassificationEditView.cxx @@ -8,13 +8,14 @@ * */ -#include <svx/ClassificationEditView.hxx> #include <svx/ClassificationField.hxx> #include <svl/itemset.hxx> #include <editeng/wghtitem.hxx> #include <editeng/eeitem.hxx> +#include "ClassificationEditView.hxx" + namespace svx { ClassificationEditEngine::ClassificationEditEngine(SfxItemPool* pItemPool) diff --git a/include/svx/ClassificationEditView.hxx b/svx/source/dialog/ClassificationEditView.hxx index 8c30518b1816..8c30518b1816 100644 --- a/include/svx/ClassificationEditView.hxx +++ b/svx/source/dialog/ClassificationEditView.hxx diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index e0f08b036cd5..7e71b34ccaed 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -10,7 +10,6 @@ #include <config_features.h> #include <test/bootstrapfixture.hxx> -#include <test/setupvcl.hxx> #include <vcl/errinf.hxx> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> @@ -30,6 +29,8 @@ #include <memory> #include <cstring> +#include "setupvcl.hxx" + using namespace ::com::sun::star; static void aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx index 81d53b0f2734..56c0a3b3c84c 100644 --- a/test/source/setupvcl.cxx +++ b/test/source/setupvcl.cxx @@ -15,12 +15,12 @@ #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> -#include <test/setupvcl.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> #include <vcl/svapp.hxx> #include "isheadless.hxx" +#include "setupvcl.hxx" namespace { diff --git a/include/test/setupvcl.hxx b/test/source/setupvcl.hxx index 78d4683e50ce..78d4683e50ce 100644 --- a/include/test/setupvcl.hxx +++ b/test/source/setupvcl.hxx diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index 99777f6b483c..f6d1b97620ad 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -12,9 +12,9 @@ #include <cppunit/Protector.h> #include <sal/types.h> #include <sal/log.hxx> -#include <test/setupvcl.hxx> #include <vcl/svapp.hxx> #include <comphelper/threadpool.hxx> +#include "setupvcl.hxx" namespace { diff --git a/vcl/CppunitTest_vcl_app_test.mk b/vcl/CppunitTest_vcl_app_test.mk index 22b3104919c5..9ee43d5a3b09 100644 --- a/vcl/CppunitTest_vcl_app_test.mk +++ b/vcl/CppunitTest_vcl_app_test.mk @@ -15,6 +15,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_app_test, \ vcl/qa/cppunit/app/test_IconThemeSelector \ )) +$(eval $(call gb_CppunitTest_set_include,vcl_app_test,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + $(eval $(call gb_CppunitTest_use_libraries,vcl_app_test, \ sal \ vcl \ diff --git a/include/vcl/IconThemeScanner.hxx b/vcl/inc/IconThemeScanner.hxx index 3cbca74a4683..3cbca74a4683 100644 --- a/include/vcl/IconThemeScanner.hxx +++ b/vcl/inc/IconThemeScanner.hxx diff --git a/include/vcl/IconThemeSelector.hxx b/vcl/inc/IconThemeSelector.hxx index 0fcd66d1f263..0fcd66d1f263 100644 --- a/include/vcl/IconThemeSelector.hxx +++ b/vcl/inc/IconThemeSelector.hxx diff --git a/include/vcl/OptionalBox.hxx b/vcl/inc/OptionalBox.hxx index 326fc7536c2d..326fc7536c2d 100644 --- a/include/vcl/OptionalBox.hxx +++ b/vcl/inc/OptionalBox.hxx diff --git a/include/vcl/configsettings.hxx b/vcl/inc/configsettings.hxx index 967387499b9d..967387499b9d 100644 --- a/include/vcl/configsettings.hxx +++ b/vcl/inc/configsettings.hxx diff --git a/include/vcl/debugevent.hxx b/vcl/inc/debugevent.hxx index a6f458265cbb..a6f458265cbb 100644 --- a/include/vcl/debugevent.hxx +++ b/vcl/inc/debugevent.hxx diff --git a/include/vcl/imagerepository.hxx b/vcl/inc/imagerepository.hxx index a1a28d3fa241..a1a28d3fa241 100644 --- a/include/vcl/imagerepository.hxx +++ b/vcl/inc/imagerepository.hxx diff --git a/include/vcl/jobdata.hxx b/vcl/inc/jobdata.hxx index 28d1115c9fc8..714bcb38137a 100644 --- a/include/vcl/jobdata.hxx +++ b/vcl/inc/jobdata.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_JOBDATA_HXX #define INCLUDED_VCL_JOBDATA_HXX -#include <vcl/ppdparser.hxx> +#include "ppdparser.hxx" namespace psp { diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 01b514eb1d88..81dc449fbafb 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -271,7 +271,7 @@ #include <vcl/canvastools.hxx> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> #include <vcl/cvtgrf.hxx> diff --git a/include/vcl/ppdparser.hxx b/vcl/inc/ppdparser.hxx index a0a59c4a8d80..a0a59c4a8d80 100644 --- a/include/vcl/ppdparser.hxx +++ b/vcl/inc/ppdparser.hxx diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx index 3ac76a91dde5..020365b8be0a 100644 --- a/vcl/inc/printerinfomanager.hxx +++ b/vcl/inc/printerinfomanager.hxx @@ -26,12 +26,13 @@ #include <unordered_set> #include <vcl/dllapi.h> -#include <vcl/jobdata.hxx> #include <vcl/prntypes.hxx> #include <osl/time.h> #include <cstdio> +#include "jobdata.hxx" + namespace psp { diff --git a/include/vcl/strhelper.hxx b/vcl/inc/strhelper.hxx index 5b04e788d08d..be2f5467861f 100644 --- a/include/vcl/strhelper.hxx +++ b/vcl/inc/strhelper.hxx @@ -26,17 +26,17 @@ namespace psp { - VCL_DLLPUBLIC OUString GetCommandLineToken( int, const OUString& ); - VCL_DLLPUBLIC OString GetCommandLineToken(int, const OString&); + OUString GetCommandLineToken( int, const OUString& ); + OString GetCommandLineToken(int, const OString&); // gets one token of a unix command line style string // doublequote, singlequote and singleleftquote protect their respective // contents - VCL_DLLPUBLIC int GetCommandLineTokenCount(const OUString&); + int GetCommandLineTokenCount(const OUString&); // returns number of tokens (zero if empty or whitespace only) - VCL_DLLPUBLIC OUString WhitespaceToSpace( const OUString&, bool bProtect = true ); - VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&); + OUString WhitespaceToSpace( const OUString&, bool bProtect = true ); + OString WhitespaceToSpace(const OString&); // returns a string with multiple adjacent occurrences of whitespace // converted to a single space. if bProtect is sal_True (nonzero), then // doublequote, singlequote and singleleftquote protect their respective diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 00e174932851..14917cf72ef5 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H #define INCLUDED_VCL_INC_GENERIC_GENPRN_H -#include <vcl/jobdata.hxx> +#include <jobdata.hxx> #include <unx/printergfx.hxx> #include <unx/printerjob.hxx> #include <salprn.hxx> diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx index 9fe4a3db4945..33f92abc7be8 100644 --- a/vcl/inc/unx/printerjob.hxx +++ b/vcl/inc/unx/printerjob.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX #define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX -#include <vcl/jobdata.hxx> +#include <jobdata.hxx> #include <osl/file.hxx> #include <vector> diff --git a/include/vcl/vclstatuslistener.hxx b/vcl/inc/vclstatuslistener.hxx index 2652befcd4cc..2652befcd4cc 100644 --- a/include/vcl/vclstatuslistener.hxx +++ b/vcl/inc/vclstatuslistener.hxx diff --git a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx index 5b3231cd7022..f65e70bc6bdd 100644 --- a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx @@ -10,7 +10,7 @@ #include <stdexcept> #include <rtl/ustring.hxx> -#include <vcl/IconThemeScanner.hxx> +#include <IconThemeScanner.hxx> #include <vcl/IconThemeInfo.hxx> #include <cppunit/TestAssert.h> diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx index cff9641cd033..69f61c79e381 100644 --- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <vcl/IconThemeSelector.hxx> +#include <IconThemeSelector.hxx> #include <vcl/IconThemeInfo.hxx> diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 0eba21837245..a9163af3c690 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -12,7 +12,7 @@ #include <deque> -#include <vcl/IconThemeScanner.hxx> +#include <IconThemeScanner.hxx> #include <osl/file.hxx> #include <salhelper/linkhelper.hxx> diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 225414fcc8b7..90a927a67481 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -9,7 +9,7 @@ #include <comphelper/lok.hxx> -#include <vcl/IconThemeSelector.hxx> +#include <IconThemeSelector.hxx> #include <vcl/IconThemeInfo.hxx> #include <config_mpl.h> diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 59962b2bdd30..ee17e42f3a1d 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -34,14 +34,14 @@ #include <comphelper/lok.hxx> #include <vcl/graphicfilter.hxx> -#include <vcl/IconThemeScanner.hxx> -#include <vcl/IconThemeSelector.hxx> +#include <IconThemeScanner.hxx> +#include <IconThemeSelector.hxx> #include <vcl/IconThemeInfo.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/outdev.hxx> #include <unotools/fontcfg.hxx> diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 82321c295be4..70db9440f6a4 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -25,7 +25,7 @@ #include <unotools/resmgr.hxx> #include <sal/log.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/dockwin.hxx> #include <vcl/menu.hxx> #include <vcl/print.hxx> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 23663c56ad9d..b8c97d08d9c8 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -40,14 +40,14 @@ #include <vcl/ImageTree.hxx> #include <vcl/settings.hxx> #include <vcl/toolkit/unowrap.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/lazydelete.hxx> #include <vcl/embeddedfontshelper.hxx> -#include <vcl/debugevent.hxx> #include <vcl/dialog.hxx> #include <vcl/menu.hxx> #include <vcl/virdev.hxx> #include <vcl/print.hxx> +#include <debugevent.hxx> #include <scrwnd.hxx> #ifdef _WIN32 diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 125060a7660c..6408709e393c 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -32,13 +32,13 @@ #include <vcl/edit.hxx> #include <vcl/layout.hxx> #include <vcl/stdtext.hxx> -#include <vcl/vclstatuslistener.hxx> #include <vcl/uitest/uiobject.hxx> #include <bitmaps.hlst> #include <svdata.hxx> #include <window.h> #include <controldata.hxx> +#include <vclstatuslistener.hxx> #include <osl/diagnose.h> #include <comphelper/dispatchcommand.hxx> diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 959b59668f62..962f54b7bf70 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -25,7 +25,7 @@ #include <fontsubset.hxx> #include <o3tl/safeint.hxx> -#include <vcl/strhelper.hxx> +#include <strhelper.hxx> #include <sal/log.hxx> typedef sal_uInt8 U8; diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index f8b9edb7c50c..8d477ec37227 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <svdata.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 31daa05a73bd..ec148b2159d8 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -61,7 +61,7 @@ #include <vcl/lineinfo.hxx> #include <vcl/metric.hxx> #include <vcl/settings.hxx> -#include <vcl/strhelper.hxx> +#include <strhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/filter/pdfdocument.hxx> diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 6a07ca13c04a..7c3a1ec5056a 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -21,7 +21,7 @@ #include <vcl/print.hxx> #include <vcl/svapp.hxx> #include <vcl/metaact.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx index 338c5b3ad51c..9c7173158184 100644 --- a/vcl/source/graphic/UnoGraphicProvider.cxx +++ b/vcl/source/graphic/UnoGraphicProvider.cxx @@ -20,7 +20,7 @@ #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/metaact.hxx> -#include <vcl/imagerepository.hxx> +#include <imagerepository.hxx> #include <tools/fract.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/graphicfilter.hxx> diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 1153c6b520cf..96e10b4865e8 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/strhelper.hxx> +#include <strhelper.hxx> namespace { diff --git a/vcl/source/image/ImageRepository.cxx b/vcl/source/image/ImageRepository.cxx index 59b9563549e9..6bf57e699419 100644 --- a/vcl/source/image/ImageRepository.cxx +++ b/vcl/source/image/ImageRepository.cxx @@ -18,7 +18,7 @@ */ #include <vcl/bitmapex.hxx> -#include <vcl/imagerepository.hxx> +#include <imagerepository.hxx> #include <vcl/ImageTree.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index af91c8fe31fa..f08f1973c785 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -49,7 +49,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/BitmapTools.hxx> -#include <vcl/IconThemeScanner.hxx> +#include <IconThemeScanner.hxx> #include <vcl/filter/PngImageReader.hxx> #include <vcl/outdev.hxx> #include <vcl/pngwrite.hxx> diff --git a/include/vcl/opengl/GLMHelper.hxx b/vcl/source/opengl/GLMHelper.hxx index bcf244854e4e..9f4cd20f9e7c 100644 --- a/include/vcl/opengl/GLMHelper.hxx +++ b/vcl/source/opengl/GLMHelper.hxx @@ -15,9 +15,9 @@ #include <ostream> -VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix); -VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos); -VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos); +std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix); +std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos); +std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos); #endif diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 13e7c4fb7615..1c9fa66436c8 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <vcl/opengl/GLMHelper.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <osl/file.hxx> @@ -43,6 +42,8 @@ #include <opengl/win/WinDeviceInfo.hxx> #endif +#include "GLMHelper.hxx" + static bool volatile gbInShaderCompile = false; OpenGLZone::AtomicCounter OpenGLZone::gnEnterCount = 0; OpenGLZone::AtomicCounter OpenGLZone::gnLeaveCount = 0; diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index 814c0b6161c5..689f26dbaf6d 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -25,8 +25,8 @@ #include <vcl/commandinfoprovider.hxx> #include <vcl/vclenum.hxx> #include <vcl/toolbox.hxx> -#include <vcl/OptionalBox.hxx> #include <vcl/IPrioritable.hxx> +#include <OptionalBox.hxx> static const char STYLE_TEXT[] = "Text"; static const char STYLE_ICON[] = "Icon"; diff --git a/vcl/source/window/OptionalBox.cxx b/vcl/source/window/OptionalBox.cxx index 6f47b468f194..f81d246cf2b9 100644 --- a/vcl/source/window/OptionalBox.cxx +++ b/vcl/source/window/OptionalBox.cxx @@ -19,7 +19,7 @@ #include <vcl/builderfactory.hxx> #include <vcl/layout.hxx> -#include <vcl/OptionalBox.hxx> +#include <OptionalBox.hxx> /* * OptionalBox - shows or hides the content. To use with PriorityHBox diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index bb0d54b1150e..f6fa5d8c0882 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -12,9 +12,9 @@ #include <sal/log.hxx> #include <vcl/keycodes.hxx> #include <vcl/svapp.hxx> -#include <vcl/debugevent.hxx> #include <vcl/wrkwin.hxx> #include <vcl/menu.hxx> +#include <debugevent.hxx> #include <window.h> #include <salwtype.hxx> diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e2a617270af2..e2d2d91347b5 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <vcl/toolkit/unowrap.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <map> #include <string_view> diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index cbba1ac3f562..1f88e9d2140e 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -27,7 +27,7 @@ #include <vcl/print.hxx> #include <vcl/wall.hxx> #include <vcl/decoview.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/help.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 339c81130d92..c11d7285d5b9 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -29,7 +29,7 @@ #include <vcl/layout.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> -#include <vcl/vclstatuslistener.hxx> +#include <vclstatuslistener.hxx> #include <vcl/ptrstyle.hxx> #include <bitmaps.hlst> diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 02659996768c..e39285c4ac6d 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -26,7 +26,7 @@ #include <osl/thread.h> #include <osl/process.h> #include <sal/macros.h> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <unx/wmadaptor.hxx> #include <unx/saldisp.hxx> diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index 669064ae31d8..1d318249528d 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -25,7 +25,7 @@ #include <unx/printergfx.hxx> #include <unx/printerjob.hxx> #include <unx/fontmanager.hxx> -#include <vcl/strhelper.hxx> +#include <strhelper.hxx> #include <printerinfomanager.hxx> #include <tools/color.hxx> diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 221525514b34..901edb5c0f49 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -31,7 +31,7 @@ #include <i18nlangtag/mslangid.hxx> #include <vcl/bitmapaccess.hxx> -#include <vcl/jobdata.hxx> +#include <jobdata.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index 8269b8d4be01..de598f1f656d 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -26,8 +26,8 @@ #include <unx/printerjob.hxx> #include <unx/printergfx.hxx> -#include <vcl/ppdparser.hxx> -#include <vcl/strhelper.hxx> +#include <ppdparser.hxx> +#include <strhelper.hxx> #include <printerinfomanager.hxx> #include <rtl/ustring.hxx> diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index d5de649ddd81..e5d88c7e1668 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -21,8 +21,8 @@ #define INCLUDED_VCL_GENERIC_PRINT_PRTSETUP_HXX #include <vcl/idle.hxx> -#include <vcl/ppdparser.hxx> #include <vcl/weld.hxx> +#include <ppdparser.hxx> #include <printerinfomanager.hxx> class RTSPaperPage; diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index e95263e29c49..362305beac11 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -18,7 +18,7 @@ */ #include <officecfg/Office/Common.hxx> -#include <vcl/jobdata.hxx> +#include <jobdata.hxx> #include <printerinfomanager.hxx> #include <tools/stream.hxx> diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index ffa6c873c13f..d949441db608 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -23,8 +23,8 @@ #include <comphelper/string.hxx> #include <i18nlangtag/languagetag.hxx> -#include <vcl/ppdparser.hxx> -#include <vcl/strhelper.hxx> +#include <ppdparser.hxx> +#include <strhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/vcl/unx/gtk3/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gtk3salprn-gtk.cxx index 56f2173b119f..24083dcbba46 100644 --- a/vcl/unx/gtk3/gtk3salprn-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salprn-gtk.cxx @@ -14,7 +14,7 @@ #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkprn.hxx> -#include <vcl/configsettings.hxx> +#include <configsettings.hxx> #include <vcl/help.hxx> #include <vcl/print.hxx> #include <vcl/svapp.hxx> |