Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2fa27d6f83 | |||
| 24a90a3a99 | |||
| eb7fc8fa1e | |||
| 110ce59450 | |||
| b48d8538b6 | |||
| ce9fce8364 | |||
| 1ca05579be | |||
| ea75929c4a | |||
| 521a7307d5 | |||
| fd31d3b444 | |||
| 1ca827b5eb | |||
| b55fbe3dd3 | |||
| fdf406e24e | |||
| 274ee8db40 | |||
| 272139496b | |||
| 39a0aab613 | |||
| 6f4d92a32c | |||
| 21541b80d3 | |||
| 551ea2ecfb | |||
| c5a3f8e7bc | |||
| 7cea38f49d | |||
| 6474014bf5 |
@@ -80,7 +80,6 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
public static bool IsShowingRestoreHiddenSlidesWindow = false;
|
public static bool IsShowingRestoreHiddenSlidesWindow = false;
|
||||||
private static bool IsShowingAutoplaySlidesWindow = false;
|
private static bool IsShowingAutoplaySlidesWindow = false;
|
||||||
private static bool hasLoggedPresentationWarning = false;
|
|
||||||
private bool isPowerPointInitialized = false;
|
private bool isPowerPointInitialized = false;
|
||||||
|
|
||||||
|
|
||||||
@@ -112,12 +111,18 @@ namespace Ink_Canvas {
|
|||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
||||||
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
||||||
}
|
}
|
||||||
|
|
||||||
isPowerPointInitialized = true;
|
isPowerPointInitialized = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (pptApplication != null) {
|
if (pptApplication != null) {
|
||||||
|
// 检查是否有活动演示文稿
|
||||||
|
if (pptApplication.Presentations.Count == 0 || pptApplication.ActivePresentation == null)
|
||||||
|
return; // 退出方法,避免后续代码执行
|
||||||
|
isPowerPointInitialized = false;
|
||||||
timerCheckPPT.Stop();
|
timerCheckPPT.Stop();
|
||||||
//获得演示文稿对象
|
//获得演示文稿对象
|
||||||
presentation = pptApplication.ActivePresentation;
|
presentation = pptApplication.ActivePresentation;
|
||||||
@@ -152,6 +157,7 @@ namespace Ink_Canvas {
|
|||||||
Application.Current.Dispatcher.Invoke(() => {
|
Application.Current.Dispatcher.Invoke(() => {
|
||||||
PptApplication_PresentationOpen(null);
|
PptApplication_PresentationOpen(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
//如果检测到已经开始放映,则立即进入画板模式
|
//如果检测到已经开始放映,则立即进入画板模式
|
||||||
if (pptApplication.SlideShowWindows.Count >= 1) {
|
if (pptApplication.SlideShowWindows.Count >= 1) {
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user