diff options
112 files changed, 43 insertions, 169 deletions
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index a7aed4023d1b..1d4a7dc7664a 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -18,13 +18,9 @@ */ #include <basidectrlr.hxx> - #include <basidesh.hxx> - #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <vcl/syswin.hxx> - namespace basctl { diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index d5fc199e792e..f0a7b38730a2 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -24,7 +24,6 @@ #include <svl/hint.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vcl/wrkwin.hxx> #include <basic/sbx.hxx> #include <sot/storinfo.hxx> #include <unotools/pathoptions.hxx> diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 62016979049d..281b23ec3243 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -27,7 +27,7 @@ #include <stdlib.h> #include <vcl/svapp.hxx> #include <vcl/mapmod.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/outdev.hxx> #include <vcl/timer.hxx> #include <vcl/settings.hxx> #include <basic/sbxvar.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 652c9e68b801..c72d3a0b6e9b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -128,7 +128,6 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/waitobj.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> #include <memory> diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 0a9146174b6a..39b44893c7ad 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -19,8 +19,6 @@ #include <RelationDlg.hxx> -#include <vcl/wrkwin.hxx> - #include <vcl/svapp.hxx> #include <dbu_dlg.hxx> #include <com/sun/star/sdbc/KeyRule.hpp> diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 8abb2ffbda5e..292637a19423 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -27,7 +27,6 @@ #include <sal/log.hxx> #include <cppuhelper/implbase.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/timer.hxx> #include <unotools/configmgr.hxx> diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 16224079547a..979be61afa71 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -21,7 +21,7 @@ #include <i18nlangtag/languagetag.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/window.hxx> #include <svtools/langtab.hxx> #include <vcl/errinf.hxx> diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index e841c1fac408..9da8710c328a 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -28,7 +28,6 @@ #include <math.h> #include <svl/style.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/outliner.hxx> #include "paralist.hxx" #include <editeng/outlobj.hxx> @@ -47,6 +46,7 @@ #include <vcl/graph.hxx> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> +#include <vcl/window.hxx> #include <vcl/GraphicObject.hxx> #include <editeng/svxfont.hxx> #include <editeng/brushitem.hxx> diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index d43ccbb97a65..b9abddf04455 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -30,7 +30,6 @@ #include <editeng/outliner.hxx> #include <editeng/unoedhlp.hxx> #include <svl/poolitem.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/eeitem.hxx> #include <editeng/unoforou.hxx> diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index bed1d5cc08c0..6c0dc6899762 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -27,7 +27,6 @@ #include <vcl/layout.hxx> #include <vcl/tabpage.hxx> -#include <vcl/combobox.hxx> #include <vcl/scrbar.hxx> #include <cppuhelper/implbase1.hxx> #include "bibshortcuthandler.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 186853dfd355..3983d241ea72 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -100,7 +100,6 @@ #include <vcl/unohelp.hxx> #include <tools/diagnose_ex.h> #include <vcl/stdtext.hxx> -#include <vcl/wrkwin.hxx> #include <sal/macros.h> #include <sal/log.hxx> diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 1d0314702a1c..0279bc6684e7 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -35,7 +35,6 @@ #include <vcl/graph.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/zcodec.hxx> diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 256839897f83..f4251bc03fd0 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <vcl/button.hxx> -#include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index e66baae3d37c..565afb9d2f4d 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX #define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX -#include <vcl/lstbox.hxx> #include "fileview.hxx" #include "pickercallbacks.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index f500e9a608cc..da03c0f704fb 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -10,7 +10,6 @@ #include "PlacesListBox.hxx" #include <svtools/PlaceEditDialog.hxx> -#include <vcl/headbar.hxx> #include <vcl/event.hxx> #include <bitmaps.hlst> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 3adf45987975..02a3ef2bec2b 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -23,10 +23,7 @@ #include <tools/debug.hxx> #include <ucbhelper/commandenvironment.hxx> #include <vcl/errinf.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/treelistentry.hxx> #include <bitmaps.hlst> -#include <vcl/ptrstyle.hxx> #include <officecfg/Office/Common.hxx> RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index aae53a121ddf..b22fb1fd55ac 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -15,10 +15,6 @@ #include <unotools/viewoptions.hxx> -#include <vcl/button.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/vclptr.hxx> -#include <vcl/split.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/beans/StringPair.hpp> @@ -175,8 +171,6 @@ private: DECL_LINK( FileNameGetFocusHdl, weld::Widget&, void ); DECL_LINK( FileNameModifyHdl, weld::Entry&, void ); - DECL_LINK( SplitHdl, Splitter*, void ); - DECL_LINK( SelectFilterHdl, weld::ComboBox&, void ); DECL_LINK( TreeSelectHdl, weld::TreeView&, void ); diff --git a/fpicker/source/office/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx index f6dddd0e57fd..57da4f4e5444 100644 --- a/fpicker/source/office/autocmpledit.cxx +++ b/fpicker/source/office/autocmpledit.cxx @@ -82,33 +82,4 @@ bool AutocompleteEdit::Match( const OUString& rText ) return bRet; } -#if 0 -bool AutocompleteEdit::PreNotify( NotifyEvent& rNEvt ) -{ - if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - const KeyEvent& rEvent = *rNEvt.GetKeyEvent(); - const vcl::KeyCode& rKey = rEvent.GetKeyCode(); - vcl::KeyCode aCode( rKey.GetCode() ); - - if( ( aCode == KEY_UP || aCode == KEY_DOWN ) && !rKey.IsMod2() ) - { - Selection aSelection( GetSelection() ); - sal_uInt16 nLen = static_cast<sal_uInt16>(aSelection.Min()); - - if( !m_aMatching.empty() && - ( ( aCode == KEY_DOWN && m_nCurrent + 1 < m_aMatching.size() ) - || ( aCode == KEY_UP && m_nCurrent > 0 ) ) ) - { - SetText( m_aMatching[ aCode == KEY_DOWN ? ++m_nCurrent : --m_nCurrent ] ); - SetSelection( Selection( nLen, GetText().getLength() ) ); - return true; - } - } - } - - return Edit::PreNotify( rNEvt ); -} -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 2b2413bdc024..29ae5d08b6c9 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <osl/mutex.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index bb906ce44514..920a6d8f2b08 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -25,8 +25,6 @@ #include <ucbhelper/content.hxx> #include <rtl/ustring.hxx> #include <tools/datetime.hxx> -#include <vcl/image.hxx> - namespace svt { diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 442e83276b41..1964bf789785 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -985,7 +985,7 @@ void SvtFileView::SetDoubleClickHdl(const Link<SvtFileView*,bool>& rHdl) mpImpl->SetDoubleClickHandler(rHdl); } -sal_uLong SvtFileView::GetSelectionCount() const +sal_uInt32 SvtFileView::GetSelectionCount() const { if (mpImpl->mxView->get_visible()) return mpImpl->mxView->count_selected_rows(); diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index 89b16ec64267..f994d7a1f4d0 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -21,7 +21,6 @@ #include <memory> #include <com/sun/star/uno/Sequence.h> -#include <vcl/ctrl.hxx> #include <vcl/errinf.hxx> #include <vcl/weld.hxx> #include <rtl/ustring.hxx> @@ -157,7 +156,7 @@ public: void SetDoubleClickHdl( const Link<SvtFileView*,bool>& rHdl ); void SetOpenDoneHdl( const Link<SvtFileView*,void>& rHdl ); - sal_uLong GetSelectionCount() const; + sal_uInt32 GetSelectionCount() const; SvtContentEntry* FirstSelected() const; void selected_foreach(const std::function<bool(weld::TreeIter&)>& func); diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx index e97411c61fd1..78cccf52787c 100644 --- a/fpicker/source/office/foldertree.cxx +++ b/fpicker/source/office/foldertree.cxx @@ -11,7 +11,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/commandenvironment.hxx> -#include <vcl/treelistentry.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include "contentenumeration.hxx" #include "foldertree.hxx" diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 61e5b2ce0d55..db90c2f7f0f5 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -26,19 +26,16 @@ #include "OfficeControlAccess.hxx" #include "PlacesListBox.hxx" #include <fpsofficeResMgr.hxx> +#include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <vcl/graph.hxx> -#include <vcl/layout.hxx> -#include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <svtools/sfxecode.hxx> -#include <vcl/svtabbx.hxx> -#include <vcl/treelistentry.hxx> #include <fpicker/strings.hrc> #include <svtools/helpids.h> diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index bd5d9225b676..2dc3df9ec9e5 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -20,13 +20,6 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX #include <memory> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/combobox.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/split.hxx> -#include <vcl/treelistbox.hxx> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -37,11 +30,11 @@ #include "fpsmartcontent.hxx" #include "fpdialogbase.hxx" #include <o3tl/typed_flags_set.hxx> +#include <vcl/timer.hxx> #include <set> -class SvTabListBox; class SvtFileView; class SvtFileDialogFilter_Impl; class SvtExpFileDlg_Impl; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index fef6a72513f4..1ed153a7b248 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -21,7 +21,6 @@ #include "iodlgimp.hxx" #include <tools/debug.hxx> #include <tools/urlobj.hxx> -#include <vcl/menu.hxx> #include <svtools/inettbc.hxx> #include "iodlg.hxx" #include <bitmaps.hlst> diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 68af8a3cd36a..122bde91dc76 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -21,10 +21,7 @@ #include "PlacesListBox.hxx" -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/timer.hxx> +#include <vcl/idle.hxx> #include <deque> #include <memory> diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 54ddce6e4119..70956470025d 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -27,8 +27,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> -#include <vcl/syswin.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <rtl/ustring.hxx> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index c077807addf2..387749d14a45 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -64,7 +64,6 @@ #include <vcl/status.hxx> #include <vcl/settings.hxx> #include <vcl/window.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/dockingarea.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 525cc8896a9a..317d9468bd2a 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -30,7 +30,6 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vcl/wrkwin.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index fe46cb0fad2d..5d2d6cce610e 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <svx/svxdllapi.h> -#include <vcl/image.hxx> -#include <vcl/lstbox.hxx> #include <vcl/weld.hxx> #include <o3tl/typed_flags_set.hxx> - enum class SvxLanguageListFlags { EMPTY = 0x0000, diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 3ffc6901eeb6..e424e6499511 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -18,9 +18,7 @@ */ #include <csvtablebox.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/event.hxx> -#include <vcl/lstbox.hxx> #include <vcl/settings.hxx> #include <AccessibleCsvControl.hxx> diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index e1d468da507c..75d915438f44 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -20,13 +20,6 @@ #undef SC_DLLIMPLEMENTATION #include <svx/txencbox.hxx> -#include <vcl/button.hxx> -#include <vcl/combobox.hxx> -#include <vcl/edit.hxx> -#include <vcl/field.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/ptrstyle.hxx> #include <global.hxx> #include <scresid.hxx> diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 3ddba5d9b89a..91163c4c34e8 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -53,7 +53,7 @@ class SC_DLLPUBLIC ScImportExport OUString aStreamPath; OUString aNonConvertibleChars; OUString maFilterOptions; - sal_uLong nSizeLimit; + sal_uInt32 nSizeLimit; SCROW const nMaxImportRow; sal_Unicode cSep; // Separator sal_Unicode cStr; // String Delimiter diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 54379901752d..cea2898dfbca 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.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 2019-10-17 15:16:04 using: + Generated on 2019-10-29 12:14:08 using: ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -42,6 +42,7 @@ #include <boost/optional.hpp> #include <boost/optional/optional.hpp> #include <boost/property_tree/json_parser.hpp> +#include <boost/property_tree/ptree.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 7fe75421ecfc..89063f729b3a 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -38,7 +38,6 @@ #include <svl/whiter.hxx> #include <basic/sbmeth.hxx> #include <basic/sbstar.hxx> -#include <vcl/wrkwin.hxx> #include <basic/sbuno.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 1e8654eeb530..7b3dd295d4ee 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -28,6 +28,7 @@ #include <basic/basmgr.hxx> #include <tools/diagnose_ex.h> #include <cppuhelper/weak.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index cc6a0ce1a1ee..5cd097484940 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -23,7 +23,6 @@ #include <svl/stritem.hxx> #include <vcl/menu.hxx> -#include <vcl/wrkwin.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 683bbc24fb18..9c87c2b98093 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -23,7 +23,6 @@ #include <rtl/uri.hxx> #include <sal/log.hxx> #include <sot/exchange.hxx> -#include <vcl/wrkwin.hxx> #include <svl/rectitem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index b96fe74dd544..3b2234e8545b 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -47,6 +47,7 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/edit.hxx> +#include <vcl/svapp.hxx> #include <sfx2/unoctitm.hxx> #include <appdata.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 761b3a816dd8..5ef87f45cc91 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -48,7 +48,6 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/synchronousdispatch.hxx> -#include <vcl/wrkwin.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 30495736f821..334c10a07ecd 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -62,6 +62,7 @@ #include <tools/svlibrary.h> #include <tools/diagnose_ex.h> #include <vcl/sysdata.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index cb6529fcfde2..9c56c944b990 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/wrkwin.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <sot/formats.hxx> diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index eca397aca82b..edcb56131214 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -24,6 +24,7 @@ #include <sfx2/linkmgr.hxx> class Graphic; +struct ImplSVEvent; namespace sfx2 { class FileDialogHelper; } class SvFileObject : public sfx2::SvLinkSource diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8e8e210a2cf6..2284c8b16e16 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -32,6 +32,7 @@ #include <svl/eitem.hxx> #include <vcl/gdimtf.hxx> #include <vcl/pngwrite.hxx> +#include <vcl/svapp.hxx> #include <officecfg/Office/Common.hxx> #include <osl/file.hxx> #include <unotools/localfilehelper.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 65116d668add..349302f4e159 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -39,6 +39,7 @@ #include <basic/sbxobj.hxx> #include <basic/sbxmeth.hxx> #include <basic/sbxcore.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 4543f70571a6..1180050d6cc7 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -29,6 +29,7 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/visitem.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 4957f7168c50..7d8e3b01f34c 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -770,9 +770,8 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); SolarMutexGuard aGuard; - VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pParentWindow ? pParentWindow->GetFrameWeld() : nullptr, "sfx/ui/errorfindemaildialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(Application::GetFrameWeld(xParentWindow), "sfx/ui/errorfindemaildialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("ErrorFindEmailDialog")); xBox->run(); eResult = SEND_MAIL_CANCELLED; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 9f3a75c83a94..9ce69c407de6 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -18,6 +18,7 @@ */ #include <comphelper/string.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 7d89d5c90376..583e82e3c989 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -21,6 +21,7 @@ #include <sfxtypes.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/strings.hrc> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> IMPL_LINK_NOARG(SfxPasswordDialog, EditModifyHdl, weld::Entry&, void) diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 77b9ea1f4fd9..c3a550566bf7 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -23,7 +23,6 @@ #include <string> -#include <vcl/wrkwin.hxx> #include <unotools/viewoptions.hxx> #include <sal/log.hxx> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index c8bafb10317f..b4c8f4393e8d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -23,6 +23,7 @@ #include <vcl/event.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 8d66dec30004..573ee808d474 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -70,6 +70,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/lok.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6aa2b644b8f3..24cfa8afd294 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -50,8 +50,6 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/visitem.hxx> -#include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <sal/log.hxx> @@ -65,6 +63,8 @@ #include <svtools/asynclink.hxx> #include <svtools/DocumentToGraphicRenderer.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <comphelper/fileformat.h> #include <comphelper/documentconstants.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 3660e52fc547..1f1ead6642ed 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -37,8 +37,8 @@ #include <rtl/instance.hxx> #include <sal/log.hxx> #include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <svl/eitem.hxx> #include <svl/lstner.hxx> #include <sfx2/sfxhelp.hxx> diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 6ee10ed0e41f..3ee9a1084420 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -20,10 +20,7 @@ #define INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX #include <sal/config.h> - #include <sal/log.hxx> -#include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #if defined(DBG_UTIL) diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index f126f4218a1a..0938b7caf762 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -28,6 +28,7 @@ #include <svl/stritem.hxx> #include <unotools/historyoptions.hxx> #include <vcl/toolbox.hxx> +#include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <osl/file.hxx> #include <osl/thread.hxx> diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index 128573280cd3..348ed172a871 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -22,6 +22,7 @@ #include <arrdecl.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> +#include <vcl/svapp.hxx> #include <sfxtypes.hxx> diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 9825a92eac10..96b00f54939e 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -36,7 +36,6 @@ #include <vcl/gradient.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <tools/svborder.hxx> #include <svtools/acceleratorexecute.hxx> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 3d7bb290e781..5559034e0259 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -31,6 +31,7 @@ #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/status.hxx> +#include <vcl/svapp.hxx> #include <sfx2/app.hxx> #include <sfx2/stbitem.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 50db8dd17ab7..dd5aad9f838a 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -49,6 +49,7 @@ #include <svl/imageitm.hxx> #include <svl/visitem.hxx> #include <svl/urlbmk.hxx> +#include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 19b35904f16f..fafe5df417dc 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -36,6 +36,7 @@ #include <officecfg/Setup.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/splitwin.hxx> +#include <vcl/wrkwin.hxx> #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> #include <svl/visitem.hxx> diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 608badc8ef16..31befa4e2987 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -25,6 +25,7 @@ #include <sal/log.hxx> #include <svl/itempool.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svtools/prnsetup.hxx> #include <svl/flagitem.hxx> diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 368e75f81cda..fa0b99344cc0 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -30,7 +30,6 @@ #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> -#include <vcl/wrkwin.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index aba11a59e1f7..156ae9c81991 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.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 2019-10-17 15:16:27 using: + Generated on 2019-10-29 13:05:21 using: ./bin/update_pch svtools svt --cutoff=4 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -49,6 +49,7 @@ #include <utility> #include <vector> #include <boost/optional.hpp> +#include <boost/property_tree/ptree.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -101,7 +102,6 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/checksum.hxx> #include <vcl/combobox.hxx> #include <vcl/commandevent.hxx> diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index 0f2232139799..c84d2ca9f808 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -43,7 +43,6 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> using namespace ::osl ; using namespace ::comphelper ; diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 93bf3e6a13d6..0de6708d0827 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.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 2019-10-17 16:11:41 using: + Generated on 2019-10-29 12:13:17 using: ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -42,6 +42,7 @@ #include <utility> #include <vector> #include <boost/optional.hpp> +#include <boost/property_tree/ptree.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -128,7 +129,6 @@ #include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <vcl/wrkwin.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index a37e3e8c4693..b978311b0b7f 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -18,7 +18,6 @@ */ #include <vcl/event.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/metaact.hxx> #include <vcl/field.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 01c1a28a17a9..53b22432171b 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <vcl/wrkwin.hxx> #include <tools/helpers.hxx> #include <svl/eitem.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 3d51c2bc7f53..b971f1f94038 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -19,7 +19,6 @@ #include <sal/macros.h> #include <osl/diagnose.h> -#include <vcl/wrkwin.hxx> #include <vcl/timer.hxx> #include <svl/slstitm.hxx> #include <svl/itemiter.hxx> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 832d71b42f68..e3a806fccb88 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -18,7 +18,6 @@ */ -#include <vcl/wrkwin.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9b4052de5cb9..1ba6f7ad6fb5 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -48,7 +48,6 @@ #include <svx/fmshell.hxx> #include <svx/fmtools.hxx> #include <svx/svxids.hrc> -#include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> #include <vcl/commandevent.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 6eb21dbe0e95..194c33719df3 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -48,7 +48,6 @@ #include <sfx2/objitem.hxx> #include <sfx2/request.hxx> -#include <vcl/wrkwin.hxx> #include <svx/fmshell.hxx> #include <fmshimp.hxx> #include <svx/fmpage.hxx> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 96f209998457..b06db6191ea1 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -38,7 +38,6 @@ #include <sfx2/viewfrm.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> #include <svl/whiter.hxx> #include <sfx2/app.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b1cee44678bf..6950633e383b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -35,7 +35,6 @@ #include <fmprop.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 2f04e2ee3f74..9645ff5a1343 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_SOURCE_INC_TABWIN_HXX #include <vcl/treelistbox.hxx> -#include <vcl/floatwin.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index f55d3ffa0f57..57be5a899702 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -26,7 +26,6 @@ #include <tools/poly.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/virdev.hxx> -#include <vcl/wrkwin.hxx> #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 7b2191718dfc..37bcf744afe3 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.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 2019-10-17 15:17:13 using: + Generated on 2019-10-29 12:15:00 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -123,7 +123,6 @@ #include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <vcl/wrkwin.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index cac3b22e05fa..5737e82cde0a 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -24,7 +24,6 @@ #include <memory> #include <hintids.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <sot/storage.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 2b9f7dac8d74..c1aacf8c8bf1 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -45,7 +45,6 @@ #include <fmtinfmt.hxx> #include <swmodule.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <viewsh.hxx> #include <viewopt.hxx> #include <frmtool.hxx> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index ae5ca42a4b39..2b2d3450cb34 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -19,7 +19,6 @@ #include <UndoManager.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <swmodule.hxx> #include <doc.hxx> diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 1a5b304443e4..8a894fe58701 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -20,7 +20,6 @@ #include <hintids.hxx> #include <comphelper/string.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svl/whiter.hxx> #include <editeng/boxitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index cc2d0753b32b..64b2100b52f3 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -23,7 +23,6 @@ #include <comphelper/string.hxx> #include <utility> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index a3823229f6fc..606247c48b2b 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 64e49114f618..6b9a2035f77b 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 09d9593a5f12..e6c55e4bc19a 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -26,7 +26,6 @@ #include <tools/fract.hxx> #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/event.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ae5940dfcd7b..c58a8e4620a5 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -21,7 +21,6 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/string.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/unohelp.hxx> #include <svtools/htmlkywd.hxx> diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index a8468320b5e9..4a64e9873b3e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -32,7 +32,6 @@ #include <hintids.hxx> #include <o3tl/any.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svl/macitem.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 041be4358951..488edb6dce06 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -22,7 +22,6 @@ #include <comphelper/string.hxx> #include <comphelper/documentinfo.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> #include <i18nlangtag/languagetag.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 4060b7858d06..9d914eaea6da 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -27,7 +27,6 @@ #include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <numrule.hxx> diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index 0d20869ee8be..416c5da16105 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -26,7 +26,6 @@ #include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <numrule.hxx> #include <doc.hxx> #include <docary.hxx> diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 6d5edafd5a0d..29a1e0237d2d 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -27,7 +27,6 @@ #include <sfx2/frmhtml.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/frmdescr.hxx> -#include <vcl/wrkwin.hxx> #include <sot/storage.hxx> #include <svx/xoutbmp.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 7e4e4a2358a8..54bab22c49f4 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -21,7 +21,6 @@ #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/adjustitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/formatbreakitem.hxx> diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index a592cd48e9b4..f04aa013330b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <comphelper/flagguard.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/adjustitem.hxx> diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index c0ce2183f00a..577a9f5c7b11 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -23,7 +23,6 @@ #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <svtools/HtmlWriter.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 17f6d5750128..c1a6f7312d30 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -53,7 +53,6 @@ #include <svtools/svparser.hxx> #include <swtypes.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d638abac1052..4a5003c0dd7c 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -45,7 +45,6 @@ #include <unotools/configmgr.hxx> #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0f0b90fb6c9f..76ce6fb781a6 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -22,7 +22,6 @@ #include <comphelper/string.hxx> #include <svl/urihelper.hxx> #include <rtl/tencinfo.h> -#include <vcl/wrkwin.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index 60b716d9943f..c3c7e33eedca 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -26,7 +26,6 @@ #include <svx/svxids.hrc> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/app.hxx> #include <sfx2/docfac.hxx> #include <sfx2/printer.hxx> diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index edd697814378..8d6c5f230a17 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -26,7 +26,6 @@ #include <comphelper/string.hxx> #include <o3tl/deleter.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 1e0f4ac20a12..2ee6242d6b9f 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -23,7 +23,7 @@ #include <vcl/layout.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/syswin.hxx> #include <vcl/jobset.hxx> #include <svl/whiter.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index ecd2ffe7747a..16b42f8915eb 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -34,7 +34,6 @@ #include <unotools/configmgr.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> #include <svl/lckbitem.hxx> #include <svl/eitem.hxx> #include <svl/macitem.hxx> diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index d6f9eccf4a20..0ec62470c232 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <swerror.h> -#include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 12a95c773e86..3030c714e182 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -417,11 +417,11 @@ bool SwGlossaryHdl::Expand(weld::Window* pParent, const OUString& rShortName, pDlg->InsertGlos(i.sTitle, i.sLongName); } pDlg->SelectEntryPos(0); - const sal_Int32 nRet = RET_OK == pDlg->Execute()? - pDlg->GetSelectedIdx(): - LISTBOX_ENTRY_NOTFOUND; + const sal_Int32 nRet = RET_OK == pDlg->Execute() ? + pDlg->GetSelectedIdx() : + -1; pDlg.disposeAndClear(); - if (LISTBOX_ENTRY_NOTFOUND != nRet) + if (nRet != -1) { TextBlockInfo_Impl& rData = aFoundArr[nRet]; pGlossary = pGlossaries->GetGroupDoc(rData.sGroupName); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 67a5d390c2e0..6484855b5555 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -42,7 +42,6 @@ #include <osl/endian.h> #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/weld.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index 77152cafd4e8..4382a490ed99 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -24,7 +24,6 @@ #include <globals.hrc> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/wrkwin.hxx> #include <linguistic/lngprops.hxx> #include <com/sun/star/linguistic2/XLinguProperties.hpp> #include <swwait.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 12c9f4bd7765..4d5ec2aaa874 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -26,7 +26,6 @@ #include <vcl/errinf.hxx> #include <vcl/weld.hxx> #include <vcl/print.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/metric.hxx> #include <vcl/textview.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index 6f0a0db5f938..9dc6d467f941 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -28,7 +28,6 @@ #include <comphelper/servicehelper.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index c198a95dac8a..10530cffd435 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -51,7 +51,6 @@ #include <svx/linkwarn.hxx> #include <sfx2/htmlmode.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <sfx2/bindings.hxx> diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 380ecebcbc27..3d85fb02edb0 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -61,7 +61,6 @@ #include <edtwin.hxx> #include <ndtxt.hxx> #include <txtfrm.hxx> -#include <vcl/lstbox.hxx> #include <cmdid.h> #include <globals.hrc> #include <strings.hrc> diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 9bc9944ca36c..6d07a2a36441 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -44,7 +44,6 @@ #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <vcl/layout.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/unolingu.hxx> #include <edtwin.hxx> #include <swmodule.hxx> diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 034bb5eaf990..cc0385748950 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -42,7 +42,6 @@ #include <svx/svxids.hrc> #include <editeng/lrspitem.hxx> #include <svl/style.hxx> -#include <vcl/lstbox.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> |