diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-13 11:50:41 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-12-13 16:33:58 +0100 |
| commit | 7b148b0edfb217196c171f8e64e79b49669fc36f (patch) | |
| tree | 9f98e17390b19c2a976b3b638f7234549db0f574 /embeddedobj | |
| parent | e07f85a68cedde82a32a2b1f9bde75f25d7dc640 (diff) | |
WIN move native dialog hack into WinScheduler
The "hides" the hack for native Windows dialogs introduced in
commit 5bb798a99e7b ("tdf#117295 WIN no main loop shortcut for
OLE dialog") in its own header.
Change-Id: I1f36aad20dec50ae1f296001b51085989afb19f6
Reviewed-on: https://gerrit.libreoffice.org/65100
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/Library_emboleobj.mk | 1 | ||||
| -rw-r--r-- | embeddedobj/source/msole/xdialogcreator.cxx | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 3bfbec56d89d..9e3c1b5950d2 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/em $(eval $(call gb_Library_set_include,emboleobj,\ -I$(SRCDIR)/embeddedobj/source/inc \ - $(if $(filter WNT,$(OS)),-I$(SRCDIR)/vcl/inc) \ $$(INCLUDE) \ )) diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index be26a300d298..836f198eb867 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -43,10 +43,7 @@ #ifdef _WIN32 #include <oledlg.h> - -#include <svsys.h> -#include <win/saldata.hxx> -#include <win/salinst.h> +#include <vcl/winscheduler.hxx> class InitializedOleGuard { @@ -180,8 +177,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia // Disable any event loop shortcuts by enabling a real timer. // This way the native windows dialog won't block our own processing. - BOOL const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, SAL_MSG_FORCE_REAL_TIMER, 0, 0); - SAL_WARN_IF(0 == ret, "embeddedobj.ole", "ERROR: PostMessage() failed!"); + WinScheduler::SetForceRealTimer(); uTemp=pInsertFct(&io); |