strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Link to oledlg, and use OleUIInsertObjectW directly

Browse source 
... instead of manually loading and using OleUIInsertObjectA.

Change-Id: I597dd44e13edf8c94d83f434b57142c88e5aca6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163922
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2024-02-25 19:28:24 +06:00
parent a9e1fb6921
commit 74185b8edf
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
embeddedobj/Library_emboleobj.mk
View file

@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emboleobj,\
gdi32 \
ole32 \
oleaut32 \
oledlg \
uuid \
))

25
embeddedobj/source/msole/xdialogcreator.cxx
View file

@ -51,6 +51,7 @@
#ifdef _WIN32
#include <oledlg.h>
#include <o3tl/char16_t2wchar_t.hxx>
#include <vcl/winscheduler.hxx>
namespace {
@ -140,34 +141,21 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
InitializedOleGuard aGuard;
OLEUIINSERTOBJECT io = {};
char szFile[MAX_PATH];
UINT uTemp;
io.cbStruct = sizeof(io);
OLEUIINSERTOBJECTW io{ sizeof(io) };
io.hWndOwner = GetActiveWindow();
wchar_t szFile[MAX_PATH];
szFile[0] = 0;
io.lpszFile = szFile;
io.cchFile = MAX_PATH;
io.cchFile = std::size(szFile);
io.dwFlags = IOF_SELECTCREATENEW | IOF_DISABLELINK;
::osl::Module aOleDlgLib;
if( !aOleDlgLib.load( "oledlg" ))
throw uno::RuntimeException();
OleUIInsertObjectA_Type * pInsertFct = reinterpret_cast<OleUIInsertObjectA_Type *>(
aOleDlgLib.getSymbol( "OleUIInsertObjectA" ));
if( !pInsertFct )
throw uno::RuntimeException();
// Disable any event loop shortcuts by enabling a real timer.
// This way the native windows dialog won't block our own processing.
WinScheduler::SetForceRealTimer();
uTemp=pInsertFct(&io);
UINT uTemp = OleUIInsertObjectW(&io);
if ( OLEUI_OK != uTemp )
throw ucb::CommandAbortedException();
@ -196,8 +184,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
}
else
{
OUString aFileName
= OStringToOUString( std::string_view( szFile ), osl_getThreadTextEncoding() );
OUString aFileName(o3tl::toU(szFile));
OUString aFileURL;
if ( osl::FileBase::getFileURLFromSystemPath( aFileName, aFileURL ) != osl::FileBase::E_None )
throw uno::RuntimeException();