diff options
24 files changed, 8 insertions, 62 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index e11a70acbbce..6375a9a68f91 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -29,17 +29,10 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/basemutex.hxx> #include <vcl/customweld.hxx> -#include <vcl/weld.hxx> -#include <vcl/dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/field.hxx> #include <vcl/bitmapaccess.hxx> -#include <vcl/decoview.hxx> #include <vcl/svapp.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 7b70ed34fa0a..b0acc4b8f2ee 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -23,11 +23,6 @@ #include <pastedlg.hxx> #include <svtools/svmedit.hxx> #include <svtools/insdlg.hxx> -#include <vcl/dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/group.hxx> -#include <vcl/lstbox.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <svtools/strings.hrc> diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 0e96110ea7de..a1614b160d30 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -33,7 +33,6 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <svtools/svtabbx.hxx> diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index b2e1c3d59ad4..9355419bd996 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -20,14 +20,9 @@ #ifndef INCLUDED_CUI_SOURCE_INC_CUIGRFFLT_HXX #define INCLUDED_CUI_SOURCE_INC_CUIGRFFLT_HXX -#include <vcl/fixed.hxx> -#include <vcl/field.hxx> -#include <vcl/button.hxx> -#include <vcl/timer.hxx> -#include <vcl/dialog.hxx> -#include <vcl/group.hxx> #include <tools/helpers.hxx> #include <vcl/GraphicObject.hxx> +#include <vcl/timer.hxx> #include <svx/graphctl.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 4ac036ff6c10..83b42d409e07 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -19,12 +19,6 @@ #ifndef INCLUDED_CUI_SOURCE_INC_DLGNAME_HXX #define INCLUDED_CUI_SOURCE_INC_DLGNAME_HXX - -#include <vcl/edit.hxx> -#include <vcl/button.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/vclmedit.hxx> #include <vcl/weld.hxx> /// Dialog for editing a name diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 518ac7ce7e8b..e07dde7792c6 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CUI_SOURCE_INC_HLMARKWN_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/floatwin.hxx> #include <svtools/treelistbox.hxx> diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index fadddf94d570..892386c2d89b 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -24,18 +24,9 @@ #include <com/sun/star/embed/XStorage.hpp> #include <svtools/insdlg.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/field.hxx> -#include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> #include <vcl/weld.hxx> -#include <svtools/svmedit.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -class VclFrame; - class INetURLObject; class InsertObjectDialog_Impl : public weld::GenericDialogController diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 4da0aae75e2e..24a0fccc556a 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -33,7 +33,6 @@ #include <editeng/numdef.hxx> #include <editeng/svxenum.hxx> #include <svtools/ctrlbox.hxx> -#include <vcl/dialog.hxx> #define MN_GALLERY_ENTRY 100 diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index 9e2774643da0..4981c89d5e90 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX #include <vcl/button.hxx> -#include <vcl/dialog.hxx> #include <sfx2/tabdlg.hxx> class SvxBasicIDEOptionsPage: public SfxTabPage diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index a4e560b3b163..2036032cd7be 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -24,6 +24,7 @@ #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> +#include <vcl/dialog.hxx> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 02cc6f15c9a9..2a2374a0b728 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -22,15 +22,14 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <vcl/errcode.hxx> -#include <vcl/dialog.hxx> -#include <vcl/edit.hxx> -#include <vcl/button.hxx> #include <vcl/graph.hxx> +#include <vcl/weld.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/docfilt.hxx> diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b1c27bdd4321..de4285e7e81e 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/interfacecontainer.hxx> #include <sfx2/shell.hxx> #include <tools/gen.hxx> -#include <vcl/dialog.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/errcode.hxx> #include <vcl/jobset.hxx> @@ -64,7 +63,6 @@ class Printer; class SfxPrinter; class SfxProgress; class SfxFrameItem; -class Dialog; class Menu; class NotifyEvent; class SfxInPlaceClient; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 9b1645fde80c..973313dadd4a 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -26,7 +26,6 @@ #include <vcl/ctrl.hxx> #include <vcl/image.hxx> #include <vcl/fixed.hxx> -#include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/weld.hxx> #include <rtl/ustring.hxx> diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx index beb2fbc75a1e..89f4a7f90c11 100644 --- a/include/svx/ClassificationEditView.hxx +++ b/include/svx/ClassificationEditView.hxx @@ -14,7 +14,6 @@ #include <sal/config.h> #include <svx/svxdllapi.h> #include <vcl/ctrl.hxx> -#include <vcl/dialog.hxx> #include <editeng/flditem.hxx> #include <editeng/numitem.hxx> #include <editeng/editeng.hxx> diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index 6eaafe82d6e2..2ffd180e278c 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -23,12 +23,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <vcl/button.hxx> -#include <vcl/combobox.hxx> -#include <vcl/dialog.hxx> -#include <vcl/edit.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> namespace com { namespace sun { namespace star { namespace util { diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 953b53c18490..57bc02ded261 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_GALCTRL_HXX #define INCLUDED_SVX_GALCTRL_HXX -#include <vcl/dialog.hxx> #include <vcl/graph.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 8e6b34cf311a..675948751c75 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -22,10 +22,6 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <vcl/dialog.hxx> -#include <vcl/edit.hxx> -#include <vcl/svapp.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/weld.hxx> #include <sot/exchange.hxx> #include <sax/tools/converter.hxx> diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 358df72ff6c9..fc7bbde7d4d9 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -25,7 +25,6 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> #include <vcl/morebtn.hxx> -#include <vcl/dialog.hxx> #include <svtools/scriptedtext.hxx> #include <svx/framelinkarray.hxx> #include <scdllapi.h> diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 8de81b856815..9b91b5901b63 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -38,6 +38,7 @@ #include <svl/urihelper.hxx> #include <svtools/transfer.hxx> #include <sot/formats.hxx> +#include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx index 3fda7b5dc6c9..99989843fa45 100644 --- a/svx/source/dialog/ClassificationEditView.cxx +++ b/svx/source/dialog/ClassificationEditView.cxx @@ -11,6 +11,7 @@ #include <svx/ClassificationEditView.hxx> #include <svx/ClassificationField.hxx> +#include <vcl/builder.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index ad45af630a2a..96851ff2c655 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -122,8 +122,7 @@ namespace svx { if ( ::utl::UCBContentHelper::Exists( sURL ) ) { - vcl::Window* pWin = m_rLocationInput.GetSystemWindow(); - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(m_rLocationInput.GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, SvxResId(RID_STR_ALREADYEXISTOVERWRITE))); if (xQueryBox->run() != RET_YES) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 1b437fe76e33..f8d802cf95fa 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <vcl/dialog.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 17e780c7877e..9ea3edb99490 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -21,7 +21,6 @@ #include <vcl/button.hxx> #include <vcl/edit.hxx> -#include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> #include <vcl/idle.hxx> diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 2827cf3c7a52..9eee09388514 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -18,7 +18,6 @@ */ #include <tools/urlobj.hxx> -#include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> |