diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs index 2da528a..c1bd513 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs @@ -100,7 +100,7 @@ namespace FileConverter.ConversionJobs this.document.Close(false); this.document = null; - this.ReleaseApplicationInstanceIfNeeded(); + this.ReleaseOfficeApplicationInstanceIfNeeded(); if (this.pdf2ImageConversionJob != null) { @@ -133,6 +133,27 @@ namespace FileConverter.ConversionJobs } } + protected override void InitializeOfficeApplicationInstanceIfNecessary() + { + if (this.application != null) + { + return; + } + + // Initialize excel application. + Diagnostics.Debug.Log("Instantiate excel application via interop."); + this.application = new Excel.Application + { + Visible = false + }; + } + + protected override void ReleaseOfficeApplicationInstanceIfNeeded() + { + Diagnostics.Debug.Log("Quit excel application via interop."); + this.application.Quit(); + } + private async Task UpdateProgress() { while (this.pdf2ImageConversionJob.State != ConversionState.Done && @@ -155,7 +176,7 @@ namespace FileConverter.ConversionJobs private void LoadDocumentIfNecessary() { - this.InitializeApplicationInstanceIfNecessary(); + this.InitializeOfficeApplicationInstanceIfNecessary(); if (this.document == null) { @@ -164,26 +185,5 @@ namespace FileConverter.ConversionJobs this.document = this.application.Workbooks.Open(this.InputFilePath, System.Reflection.Missing.Value, true); } } - - private void InitializeApplicationInstanceIfNecessary() - { - if (this.application != null) - { - return; - } - - // Initialize excel application. - Diagnostics.Debug.Log("Instantiate excel application via interop."); - this.application = new Excel.Application - { - Visible = false - }; - } - - private void ReleaseApplicationInstanceIfNeeded() - { - Diagnostics.Debug.Log("Quit excel application via interop."); - this.application.Quit(); - } } } diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs index cd0c1c5..088b27b 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs @@ -22,5 +22,16 @@ namespace FileConverter.ConversionJobs return; } } + + protected override void OnConversionFailed() + { + base.OnConversionFailed(); + + this.ReleaseOfficeApplicationInstanceIfNeeded(); + } + + protected abstract void InitializeOfficeApplicationInstanceIfNecessary(); + + protected abstract void ReleaseOfficeApplicationInstanceIfNeeded(); } } \ No newline at end of file diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs index 040d175..619025f 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs @@ -80,9 +80,6 @@ namespace FileConverter.ConversionJobs this.LoadDocumentIfNecessary(); - // Make this document the active document. - //this.document.Activate(); - this.UserState = Properties.Resources.ConversionStateConversion; Diagnostics.Debug.Log("Convert PowerPoint document to pdf."); @@ -92,7 +89,7 @@ namespace FileConverter.ConversionJobs this.document.Close(); this.document = null; - this.ReleaseApplicationInstanceIfNeeded(); + this.ReleaseOfficeApplicationInstanceIfNeeded(); if (this.pdf2ImageConversionJob != null) { @@ -125,6 +122,24 @@ namespace FileConverter.ConversionJobs } } + protected override void InitializeOfficeApplicationInstanceIfNecessary() + { + if (this.application != null) + { + return; + } + + // Initialize PowerPoint application. + Diagnostics.Debug.Log("Instantiate PowerPoint application via interop."); + this.application = new PowerPoint.Application(); + } + + protected override void ReleaseOfficeApplicationInstanceIfNeeded() + { + Diagnostics.Debug.Log("Quit PowerPoint application via interop."); + this.application.Quit(); + } + private async Task UpdateProgress() { while (this.pdf2ImageConversionJob.State != ConversionState.Done && @@ -147,32 +162,14 @@ namespace FileConverter.ConversionJobs private void LoadDocumentIfNecessary() { - this.InitializeApplicationInstanceIfNecessary(); + this.InitializeOfficeApplicationInstanceIfNecessary(); if (this.document == null) { Diagnostics.Debug.Log("Load PowerPoint document '{0}'.", this.InputFilePath); - this.document = this.application.Presentations.Open(this.InputFilePath, ReadOnly:MsoTriState.msoTrue, WithWindow:MsoTriState.msoFalse); + this.document = this.application.Presentations.Open(this.InputFilePath, ReadOnly: MsoTriState.msoTrue, WithWindow: MsoTriState.msoFalse); } } - - private void InitializeApplicationInstanceIfNecessary() - { - if (this.application != null) - { - return; - } - - // Initialize PowerPoint application. - Diagnostics.Debug.Log("Instantiate PowerPoint application via interop."); - this.application = new PowerPoint.Application(); - } - - private void ReleaseApplicationInstanceIfNeeded() - { - Diagnostics.Debug.Log("Quit PowerPoint application via interop."); - this.application.Quit(); - } } } diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs index e7ed35f..27acaed 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs @@ -92,7 +92,7 @@ namespace FileConverter.ConversionJobs this.document.Close(Word.WdSaveOptions.wdDoNotSaveChanges); this.document = null; - this.ReleaseWordApplicationInstanceIfNeeded(); + this.ReleaseOfficeApplicationInstanceIfNeeded(); if (this.pdf2ImageConversionJob != null) { @@ -125,6 +125,27 @@ namespace FileConverter.ConversionJobs } } + protected override void InitializeOfficeApplicationInstanceIfNecessary() + { + if (this.wordApplication != null) + { + return; + } + + // Initialize word application. + Diagnostics.Debug.Log("Instantiate word application via interop."); + this.wordApplication = new Microsoft.Office.Interop.Word.Application + { + Visible = false + }; + } + + protected override void ReleaseOfficeApplicationInstanceIfNeeded() + { + Diagnostics.Debug.Log("Quit word application via interop."); + this.wordApplication.Quit(); + } + private async Task UpdateProgress() { while (this.pdf2ImageConversionJob.State != ConversionState.Done && @@ -147,7 +168,7 @@ namespace FileConverter.ConversionJobs private void LoadDocumentIfNecessary() { - this.InitializeWordApplicationInstanceIfNecessary(); + this.InitializeOfficeApplicationInstanceIfNecessary(); if (this.document == null) { @@ -156,26 +177,5 @@ namespace FileConverter.ConversionJobs this.document = this.wordApplication.Documents.Open(this.InputFilePath, System.Reflection.Missing.Value, true); } } - - private void InitializeWordApplicationInstanceIfNecessary() - { - if (this.wordApplication != null) - { - return; - } - - // Initialize word application. - Diagnostics.Debug.Log("Instantiate word application via interop."); - this.wordApplication = new Microsoft.Office.Interop.Word.Application - { - Visible = false - }; - } - - private void ReleaseWordApplicationInstanceIfNeeded() - { - Diagnostics.Debug.Log("Quit word application via interop."); - this.wordApplication.Quit(); - } } }