diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 454bc33c1d80..b6a5ec45b96f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -36,6 +36,7 @@ #include #include +#include #include #include #include diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 4a1d538b5394..fabdc2b863ac 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 0e6390bc32fd..6066ae0aaadd 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include using namespace css::chart2; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index a1760aa67656..7a58012317e6 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 5ea7cfc4b450..642d179dd00d 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/inc/ImageViewerDialog.hxx b/cui/source/inc/ImageViewerDialog.hxx index 1ff26307a5f2..d60d06fe8ef1 100644 --- a/cui/source/inc/ImageViewerDialog.hxx +++ b/cui/source/inc/ImageViewerDialog.hxx @@ -10,7 +10,7 @@ #include #include -#include +#include class ImageViewerDialog : public weld::GenericDialogController { diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 06e513d434b0..ecbaaef10e00 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 992536c29418..51f4c2086da3 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 85ab4de4c779..d043e7c30b0d 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/inc/querydialog.hxx b/cui/source/inc/querydialog.hxx index 7bc120a8f1f7..ee7db8ad6036 100644 --- a/cui/source/inc/querydialog.hxx +++ b/cui/source/inc/querydialog.hxx @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index f7386b8dab3a..6792cd1fd4bc 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 8dfbc334911a..99601aee3f1e 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/inc/uitabpage.hxx b/cui/source/inc/uitabpage.hxx index 5f4b7d2969d0..7d8978ce2e09 100644 --- a/cui/source/inc/uitabpage.hxx +++ b/cui/source/inc/uitabpage.hxx @@ -10,6 +10,7 @@ #pragma once #include +#include #include diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index ea234b337282..76a742e689a8 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -22,6 +22,7 @@ #include #include #include +#include namespace svx { class SecurityOptionsDialog; diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index d06d621f1763..abed765a2133 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -19,6 +19,7 @@ #pragma once #include +#include #include namespace dbaui diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 0b7745191143..19014a641092 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -29,6 +29,7 @@ #include "fpsmartcontent.hxx" #include "fpdialogbase.hxx" #include +#include #include #include diff --git a/framework/source/uielement/FixedImageToolbarController.cxx b/framework/source/uielement/FixedImageToolbarController.cxx index 1603fd111574..29f167cbe565 100644 --- a/framework/source/uielement/FixedImageToolbarController.cxx +++ b/framework/source/uielement/FixedImageToolbarController.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 63a81ed283d8..43281fe3ccd1 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 5d019478d981..1e5f58e817c6 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/include/svx/labelitemwindow.hxx b/include/svx/labelitemwindow.hxx index 23554e20d8e6..859d337f83e5 100644 --- a/include/svx/labelitemwindow.hxx +++ b/include/svx/labelitemwindow.hxx @@ -9,6 +9,7 @@ #pragma once +#include #include #include #include diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index b0c9d40409ae..ef699395e640 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/include/vcl/weld/Image.hxx b/include/vcl/weld/Image.hxx new file mode 100644 index 000000000000..7d1742e667a3 --- /dev/null +++ b/include/vcl/weld/Image.hxx @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include +#include + +class VirtualDevice; + +namespace com::sun::star::graphic +{ +class XGraphic; +} + +namespace weld +{ +class VCL_DLLPUBLIC Image : virtual public Widget +{ +public: + virtual void set_from_icon_name(const OUString& rIconName) = 0; + virtual void set_image(VirtualDevice* pDevice) = 0; + virtual void set_image(const css::uno::Reference& rImage) = 0; +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index eac2fff58394..829a90a641d6 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -340,14 +340,6 @@ public: virtual void set_text(const OUString& rText) = 0; }; -class VCL_DLLPUBLIC Image : virtual public Widget -{ -public: - virtual void set_from_icon_name(const OUString& rIconName) = 0; - virtual void set_image(VirtualDevice* pDevice) = 0; - virtual void set_image(const css::uno::Reference& rImage) = 0; -}; - enum class LabelType { Normal, diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 74c807695ba0..7e28274c57bf 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 79066c3474e5..dfa7a5d80ea3 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index d350c779e1b6..a1b6989de7ed 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index 2517da7f3162..00f0a6fdba3a 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index af1dddb29920..9c855db1e0a9 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index eea63438149e..a174e8c986fc 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index cd2c03466b0d..9060e646776a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 33bd5929967e..6e863a8c6ee1 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 01168bddde69..085d9b712e46 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 192e69e24c8e..96dbe073cbec 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 876ce034bf42..8e131e437fac 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 27bfe92d61f7..20810be34fb0 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/uibase/inc/pagenumberdlg.hxx b/sw/source/uibase/inc/pagenumberdlg.hxx index 0f33d29c2a29..24bdc8e1b149 100644 --- a/sw/source/uibase/inc/pagenumberdlg.hxx +++ b/sw/source/uibase/inc/pagenumberdlg.hxx @@ -21,6 +21,7 @@ #include #include +#include /// Page number wizard for easy header/footer page number insertion class SwPageNumberDlg final : public SfxDialogController diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 1fb2b84397ba..4841411e990c 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index e5d4aea22d5b..9aa440d36649 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 72db48782ab9..d77a30bb968b 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/inc/qt5/QtInstanceImage.hxx b/vcl/inc/qt5/QtInstanceImage.hxx index ab2a8931eda9..c49767bdabdf 100644 --- a/vcl/inc/qt5/QtInstanceImage.hxx +++ b/vcl/inc/qt5/QtInstanceImage.hxx @@ -13,6 +13,8 @@ #include "QtInstanceWidget.hxx" +#include + #include class QtInstanceImage : public QtInstanceWidget, public virtual weld::Image diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 7ae6797ab1f8..792b0250f3fb 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d3d696240f60..30463092cb1d 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index 4065172be225..a2b35139c7ea 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 40b06e44f0ce..4e5d76231fea 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -20,6 +20,7 @@ #pragma once #include +#include #include #include #include diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 4e541f867e48..247db7e835c7 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include