diff options
33 files changed, 34 insertions, 269 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 729c5b85c7bd..447fde2a37aa 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.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-12-03 09:19:08 using: + Generated on 2019-12-04 09:30:37 using: ./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -116,7 +116,6 @@ #include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> -#include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gfxlink.hxx> @@ -136,7 +135,6 @@ #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> #include <vcl/task.hxx> #include <vcl/textfilter.hxx> #include <vcl/timer.hxx> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index dba595d5dd21..62dd835bb0e1 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -31,6 +31,7 @@ #include <vcl/virdev.hxx> #include <svl/stritem.hxx> #include <officecfg/Office/Common.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/dispatchcommand.hxx> diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 41df1d05896f..dc754a5edfb7 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <sfx2/tabdlg.hxx> +#include <vcl/idle.hxx> #include <i18nutil/searchopt.hxx> #include "cfgutil.hxx" diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index cb6b53a08176..ae9cf9961ad8 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -71,6 +71,7 @@ #include <vcl/vclenum.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/window.hxx> #include <vcl/IconThemeInfo.hxx> #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index e79a39607d73..c39c0b4bef2e 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -32,6 +32,7 @@ #include <svl/intitem.hxx> #include <vcl/settings.hxx> #include <vcl/event.hxx> +#include <vcl/image.hxx> #define IID_BOTTOMLOCK 1 #define IID_TOPLOCK 2 diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index a666ce2a508f..a4b4169a793c 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -20,6 +20,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> +#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/lang.h> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index aea68537a5fa..945d92315c94 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -37,6 +37,7 @@ #include <svx/dlgutil.hxx> #include <svl/intitem.hxx> #include <sfx2/opengrf.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/svxdlg.hxx> diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index d4d358338fbc..e4d75d15bcb4 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -48,7 +48,6 @@ namespace dbaui using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::dbtools; - using namespace ::svt; ISaveValueWrapper::~ISaveValueWrapper() { diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index b136744ed975..35a61c62a39a 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -39,7 +39,6 @@ namespace dbaui { -using namespace svt; using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; using namespace com::sun::star::lang; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index fedaa598109c..92da31ed12af 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -23,7 +23,6 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <vcl/floatwin.hxx> #include <vcl/weld.hxx> class SfxTabPage; @@ -83,43 +82,6 @@ public: SfxBindings& GetBindings() const { return *m_pBindings; } }; -// class SfxFloatingWindow -------------------------------------------------- -class SfxFloatingWindow_Impl; -class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow -{ - SfxBindings* pBindings; - Size aSize; - std::unique_ptr< SfxFloatingWindow_Impl > pImpl; - - SfxFloatingWindow(SfxFloatingWindow const &) = delete; - SfxFloatingWindow& operator =(SfxFloatingWindow const &) = delete; - -protected: - SfxFloatingWindow( SfxBindings *pBindings, - SfxChildWindow *pCW, - vcl::Window* pParent, - WinBits nWinBits); - virtual ~SfxFloatingWindow() override; - virtual void dispose() override; - - virtual void StateChanged( StateChangedType nStateChange ) override; - virtual bool Close() override; - virtual void Resize() override; - virtual void Move() override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; - SfxBindings& GetBindings() - { return *pBindings; } - -public: - virtual void FillInfo(SfxChildWinInfo&) const; - void Initialize (SfxChildWinInfo const * pInfo); - - DECL_LINK(TimerHdl, Timer *, void); - -}; - -// class SfxNoLayoutSingleTabDialog -------------------------------------------------- - typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which values class SFX2_DLLPUBLIC SfxOkDialogController : public SfxDialogController diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index f5e64fdfedf3..68279262d11d 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -272,14 +272,6 @@ public: sal_uInt16 Class::GetChildWindowId () \ { return MyID; } \ -#define SFX_IMPL_FLOATINGWINDOW(Class, MyID) \ - SFX_IMPL_CHILDWINDOW(Class, MyID) \ - SfxChildWinInfo Class::GetInfo() const \ - { \ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ - static_cast<SfxFloatingWindow*>(GetWindow())->FillInfo( aInfo ); \ - return aInfo; } - #define SFX_IMPL_MODELESSDIALOGCONTOLLER(Class, MyID) \ SFX_IMPL_CHILDWINDOW(Class, MyID) \ SfxChildWinInfo Class::GetInfo() const \ diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 325bfb8b4b4b..b8229ca338a0 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -24,6 +24,7 @@ #include <sfx2/dllapi.h> #include <sfx2/basedlgs.hxx> #include <sal/types.h> +#include <vcl/bitmapex.hxx> #include <vcl/builderpage.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 21d6e3c8af7a..dca6d9210768 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -29,10 +29,11 @@ #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> +#include <vcl/syswin.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> #include <vcl/window.hxx> -#include <vcl/settings.hxx> #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index a846e8f9016d..6c40b685dc6f 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -39,6 +39,7 @@ #include <editeng/editeng.hxx> #include <svx/svdmodel.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <sfx2/objsh.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index daf40d437532..b601417b4cc4 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_OLINEWIN_HXX #define INCLUDED_SC_SOURCE_UI_INC_OLINEWIN_HXX +#include <vcl/window.hxx> #include "viewdata.hxx" class ScOutlineEntry; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 35be32afa3b2..1da61965b4b0 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -23,9 +23,10 @@ #include <vector> #include <sfx2/tabdlg.hxx> +#include <svtools/collatorres.hxx> #include <svx/langbox.hxx> #include <unotools/collatorwrapper.hxx> -#include <svtools/collatorres.hxx> +#include <vcl/idle.hxx> #include "sortkeydlg.hxx" diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index b4cf5faac6c1..8368cbee7c89 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -30,6 +30,7 @@ #include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/window.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e9e68c8ee706..b2a7bc8cc18c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -43,6 +43,7 @@ #include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/syswin.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawView.hpp> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 9495764d9d38..b107c99c11ae 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 2019-12-03 09:21:34 using: + Generated on 2019-12-04 09:32:44 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: @@ -88,8 +88,6 @@ #include <sal/saldllapi.h> #include <sal/types.h> #include <vcl/EnumContext.hxx> -#include <vcl/Scanline.hxx> -#include <vcl/alpha.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> #include <vcl/builderfactory.hxx> @@ -103,7 +101,6 @@ #include <vcl/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fixed.hxx> -#include <vcl/floatwin.hxx> #include <vcl/font.hxx> #include <vcl/gdimtf.hxx> #include <vcl/gradient.hxx> @@ -126,8 +123,10 @@ #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> +#include <vcl/taskpanelist.hxx> #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> +#include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1180050d6cc7..13d511fddec3 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -30,6 +30,7 @@ #include <svl/stritem.hxx> #include <svl/visitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/timer.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/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 905d27fd3a3e..330109b7ce94 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -62,24 +62,6 @@ void SfxModelessDialog_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -class SfxFloatingWindow_Impl : public SfxListener -{ -public: - OString aWinState; - SfxChildWindow* pMgr; - bool bConstructed; - Idle aMoveIdle; - - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; -}; - -void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) -{ - if( rHint.GetId() == SfxHintId::Dying) { - pMgr->Destroy(); - } -} - void SfxModelessDialogController::Initialize(SfxChildWinInfo const *pInfo) /* [Description] @@ -226,187 +208,6 @@ void SfxModelessDialogController::Close() SfxCallMode::RECORD|SfxCallMode::SYNCHRON, { &aValue } ); } -bool SfxFloatingWindow::EventNotify( NotifyEvent& rEvt ) - -/* [Description] - - If a ModelessDialog is enabled, its ViewFrame will be activated. - This necessary for the PluginInFrames. -*/ - -{ - if ( pImpl ) - { - if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) - { - pBindings->SetActiveFrame( pImpl->pMgr->GetFrame() ); - pImpl->pMgr->Activate_Impl(); - } - else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) - { - if ( !HasChildPathFocus() ) - { - pBindings->SetActiveFrame( nullptr ); - } - } - else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - // First, allow KeyInput for Dialog functions - if (!FloatingWindow::EventNotify(rEvt) && SfxViewShell::Current()) - { - // then also for valid global accelerators. - return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); - } - return true; - } - } - - return FloatingWindow::EventNotify( rEvt ); -} - -SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, - SfxChildWindow *pCW, - vcl::Window* pParent, WinBits nWinBits) : - FloatingWindow (pParent, nWinBits), - pBindings(pBindinx), - pImpl( new SfxFloatingWindow_Impl ) -{ - pImpl->pMgr = pCW; - pImpl->bConstructed = false; - if ( pBindinx ) - pImpl->StartListening( *pBindinx ); - pImpl->aMoveIdle.SetPriority(TaskPriority::RESIZE); - pImpl->aMoveIdle.SetInvokeHandler(LINK(this,SfxFloatingWindow,TimerHdl)); -} - -bool SfxFloatingWindow::Close() - -/* [Description] - - The window is closed when the ChildWindow is destroyed by running the - ChildWindow-slots. If this is method is overridden by a derived class - method, then the SfxModelessDialogWindow: Close) must be called afterwards - if the Close() was not cancelled with "return sal_False". -*/ - -{ - // Execute with Parameters, since Toggle is ignored by some ChildWindows. - SfxBoolItem aValue( pImpl->pMgr->GetType(), false); - pBindings->GetDispatcher_Impl()->ExecuteList( - pImpl->pMgr->GetType(), - SfxCallMode::RECORD|SfxCallMode::SYNCHRON, { &aValue }); - - return true; -} - - -SfxFloatingWindow::~SfxFloatingWindow() -{ - disposeOnce(); -} - -void SfxFloatingWindow::dispose() -{ - if ( pImpl && pImpl->pMgr->GetFrame() == pBindings->GetActiveFrame() ) - pBindings->SetActiveFrame( nullptr ); - pImpl.reset(); - FloatingWindow::dispose(); -} - -void SfxFloatingWindow::Resize() - -/* [Description] - - This virtual method of the class FloatingWindow keeps track if a change - in size has been made. When this method is overridden by a derived class, - then the SfxFloatingWindow: Resize() must also be called. -*/ - -{ - FloatingWindow::Resize(); - if ( pImpl->bConstructed && pImpl->pMgr ) - { - // start timer for saving window status information - pImpl->aMoveIdle.Start(); - } -} - -void SfxFloatingWindow::Move() -{ - FloatingWindow::Move(); - if ( pImpl->bConstructed && pImpl->pMgr ) - { - // start timer for saving window status information - pImpl->aMoveIdle.Start(); - } -} - -/* - Implements a timer event that is triggered by a move or resize of the window - This will save config information to Views.xcu with a small delay -*/ -IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Timer *, void) -{ - pImpl->aMoveIdle.Stop(); - if ( pImpl->bConstructed && pImpl->pMgr ) - { - if ( !IsRollUp() ) - aSize = GetSizePixel(); - WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; - if ( GetStyle() & WB_SIZEABLE ) - nMask |= WindowStateMask::Width | WindowStateMask::Height; - pImpl->aWinState = GetWindowState( nMask ); - GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImpl->pMgr->GetType() ); - } -} - - -void SfxFloatingWindow::StateChanged( StateChangedType nStateChange ) -{ - if ( nStateChange == StateChangedType::InitShow ) - { - // FloatingWindows are not centered by default - if ( !pImpl->aWinState.isEmpty() ) - SetWindowState( pImpl->aWinState ); - pImpl->bConstructed = true; - } - - FloatingWindow::StateChanged( nStateChange ); -} - - -void SfxFloatingWindow::Initialize(SfxChildWinInfo const *pInfo) - -/* [Description] - - Initialization of a class SfxFloatingWindow through a SfxChildWinInfo. - The initialization is done only in a 2nd step after the constructor and - should be called by the constructor of the derived class or from the - SfxChildWindows. -*/ -{ - if (pInfo) - pImpl->aWinState = pInfo->aWinState; -} - - -void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const - -/* [Description] - - Fills a SfxChildWinInfo with specific data from SfxFloatingWindow, - so that it can be written in the INI file. It is assumed that rinfo - receives all other possible relevant data in the ChildWindow class. - Insertions are marked with size and the ZoomIn flag. - If this method is overridden, the base implementation must be called first. -*/ - -{ - rInfo.aSize = aSize; - if ( IsRollUp() ) - rInfo.nFlags |= SfxChildWindowFlags::ZOOMIN; -} - SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId) : GenericDialogController(pParent, rUIFile, rDialogId) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index d1ad9148ac4e..5f23221a0020 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -435,7 +435,7 @@ SfxDockingWindow_Impl::SfxDockingWindow_Impl(SfxDockingWindow* pBase) This virtual method of the class FloatingWindow keeps track of changes in FloatingSize. If this method is overridden by a derived class, - then the SfxFloatingWindow: Resize() must also be called. + then the FloatingWindow: Resize() must also be called. */ void SfxDockingWindow::Resize() { diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index b431cc619298..992136fd0fa1 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/weldutils.hxx> +#include <vcl/windowstate.hxx> #include <recfloat.hxx> #include <sfx2/strings.hrc> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index a1025a3dde90..55710e3fa399 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-12-03 09:41:31 using: + Generated on 2019-12-04 09:33:31 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: @@ -61,11 +61,8 @@ #include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/ref.hxx> -#include <rtl/strbuf.h> #include <rtl/string.h> #include <rtl/string.hxx> -#include <rtl/stringconcat.hxx> -#include <rtl/stringutils.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> #include <rtl/uri.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 35f4ea416ed7..eeeb473d20ca 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.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-12-03 09:41:26 using: + Generated on 2019-12-04 09:34:08 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -62,6 +62,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/character.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index a96e8d984a5d..b2c9cd46b0a4 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -62,6 +62,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> +#include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/fmtfield.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 8815d1a2be99..a828a55c7b82 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -62,6 +62,7 @@ #include <sal/log.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <memory> diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 6754f8feab42..d7adffee9982 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -22,6 +22,7 @@ #include <comphelper/processfactory.hxx> #include <tools/datetime.hxx> #include <unotools/datetime.hxx> +#include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 0ce7dd018356..b0837ccab492 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-12-03 09:23:47 using: + Generated on 2019-12-04 09:34:32 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: @@ -83,12 +83,10 @@ #include <sal/types.h> #include <sal/typesizes.h> #include <vcl/EnumContext.hxx> -#include <vcl/NotebookBarAddonsMerger.hxx> #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/builder.hxx> #include <vcl/button.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> @@ -99,7 +97,6 @@ #include <vcl/errinf.hxx> #include <vcl/event.hxx> #include <vcl/fixed.hxx> -#include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/graph.hxx> @@ -115,7 +112,6 @@ #include <vcl/outdev.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> #include <vcl/textfilter.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> @@ -124,7 +120,6 @@ #include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <vcl/windowstate.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 0d32e4980b36..5a7cf43d429e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -44,6 +44,7 @@ #include <dbui.hrc> #include <strings.hrc> #include <unomid.h> +#include <map> using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 4cc719c8fc01..6c02488fddff 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -21,6 +21,7 @@ #include <vcl/wizardmachine.hxx> #include <vcl/weld.hxx> +#include <vcl/print.hxx> #include <sfx2/basedlgs.hxx> #include <mailmergehelper.hxx> diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 3f8a8d633fff..d67b1712a53d 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -19,6 +19,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/windowstate.hxx> #include <cmdid.h> #include <swmodule.hxx> diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index c77d65430b12..89014a5841ab 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -18,11 +18,12 @@ */ #include <sfx2/objface.hxx> -#include <vcl/timer.hxx> #include <vcl/help.hxx> #include <vcl/commandevent.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/syswin.hxx> +#include <vcl/timer.hxx> #include <vcl/weld.hxx> #include <svl/whiter.hxx> |