pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macos] Fixed bug #47069

Browse Source
This commit is contained in:
Alexander Yuzhin
2020-10-27 09:39:21 +03:00
parent b61be5a396
commit dcd3eb0017
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
View File

@ -1085,18 +1085,21 @@
[openPanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result){
[openPanel orderOut:self];
CAscApplicationManager * appManager = [NSAscApplicationWorker getAppManager];
NSEditorApi::CAscLocalOpenFileDialog * imageInfo = new NSEditorApi::CAscLocalOpenFileDialog();
imageInfo->put_Id((int)fileId);
if (result == NSFileHandlingPanelOKButton) {
CAscApplicationManager * appManager = [NSAscApplicationWorker getAppManager];
NSEditorApi::CAscLocalOpenFileDialog * imageInfo = new NSEditorApi::CAscLocalOpenFileDialog();
imageInfo->put_Id((int)fileId);
imageInfo->put_Path([[[openPanel URL] path] stdwstring]);
NSEditorApi::CAscMenuEvent* pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_LOCALFILE_ADDIMAGE);
pEvent->m_pData = imageInfo;
appManager->Apply(pEvent);
} else {
imageInfo->put_Path(L"");
}
NSEditorApi::CAscMenuEvent* pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_CEF_LOCALFILE_ADDIMAGE);
pEvent->m_pData = imageInfo;
appManager->Apply(pEvent);
}];
}
}
@ -1144,23 +1147,26 @@
[openPanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result){
[openPanel orderOut:self];
CAscApplicationManager * appManager = [NSAscApplicationWorker getAppManager];
NSEditorApi::CAscLocalOpenFileDialog * imageInfo = new NSEditorApi::CAscLocalOpenFileDialog();
imageInfo->put_Id((int)fileId);
imageInfo->put_Filter([fileTypes stdwstring]);
if (result == NSFileHandlingPanelOKButton) {
CAscApplicationManager * appManager = [NSAscApplicationWorker getAppManager];
NSEditorApi::CAscLocalOpenFileDialog * imageInfo = new NSEditorApi::CAscLocalOpenFileDialog();
imageInfo->put_Id((int)fileId);
imageInfo->put_Filter([fileTypes stdwstring]);
imageInfo->put_Path([[[openPanel URL] path] stdwstring]);
if (isMulti) {
imageInfo->put_IsMultiselect(true);
}
NSEditorApi::CAscMenuEvent* pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_DOCUMENTEDITORS_OPENFILENAME_DIALOG);
pEvent->m_pData = imageInfo;
appManager->Apply(pEvent);
} else {
imageInfo->put_Path(L"");
}
if (isMulti) {
imageInfo->put_IsMultiselect(true);
}
NSEditorApi::CAscMenuEvent* pEvent = new NSEditorApi::CAscMenuEvent(ASC_MENU_EVENT_TYPE_DOCUMENTEDITORS_OPENFILENAME_DIALOG);
pEvent->m_pData = imageInfo;
appManager->Apply(pEvent);
}];
}
}