Merge pull request #7 from DecimalTurn/dev-ppam

Author: DecimalTurn

Main.ps1

@@ -29,7 +29,7 @@ function Get-OfficeApp {
     switch -Regex ($FileExtension.ToLower()) {
         '^(xlsb|xlsm||xltm|xlam)$' { return "Excel" }
         '^(docm|dotm)$' { return "Word" }
-        '^(pptm|potm)$' { return "PowerPoint" }
+        '^(pptm|potm|ppam)$' { return "PowerPoint" }
         '^(accdb|accda)$' { return "Access" }
         default { return $null }
     }
@@ -85,7 +85,8 @@ Minimize-Window "Administrator: C:\actions"
 Write-Host "========================="
 
 foreach ($folder in $folders) {
-    $app = Get-OfficeApp -FileExtension $folder.Substring($folder.LastIndexOf('.') + 1)
+    $fileExtension = $folder.Substring($folder.LastIndexOf('.') + 1)
+    $app = Get-OfficeApp -FileExtension $fileExtension
 
     if ($app -eq "Access") {
         Write-Host "Access is not supported at the moment. Skipping..."
@@ -103,15 +104,23 @@ foreach ($folder in $folders) {
 
     Write-Host "Importing VBA code into Office document" 
     . "$PSScriptRoot/scripts/Build-VBA.ps1" "${SourceDir}/${folder}" "$app"
-
-    if ($TestFramework -ieq "rubberduck") {
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "Build-VBA.ps1 failed with exit code $LASTEXITCODE"
+        exit $LASTEXITCODE
+    }
+  
+    if ($TestFramework -ieq "rubberduck" -and $fileExtension -ne "ppam") {
         Write-Host "Running tests with Rubberduck"
         $rubberduckTestResult = Test-WithRubberduck -officeApp $officeApp
         if (-not $rubberduckTestResult) {
             Write-Host "Rubberduck tests were not completed successfully, but continuing with the script..."
         }
     } else {
-        Write-Host "Test framework is not Rubberduck. Skipping tests."
+        if ($fileExtension -eq "ppam") {
+            Write-Host "Skipping tests for PowerPoint add-in (.ppam) files since Rubberduck can't run tests on them directly."
+        } else {
+            Write-Host "Test framework is not Rubberduck. Skipping tests."
+        }
     }
 
     Write-Host "Cleaning up"

scripts/Build-VBA.ps1

@@ -38,6 +38,10 @@ if ($outputFilePath.EndsWith(".xlsb")) {
     $outputFilePath = $outputFilePath -replace "\.xlsb$", ".xlsb.xlsm"
 }
 
+if ($outputFilePath.EndsWith(".ppam")) {
+    $outputFilePath = $outputFilePath -replace "\.ppam$", ".ppam.pptm"
+}
+
 # Make sure the output file already exists
 if (-not (Test-Path $outputFilePath)) {
     Write-Host "🔴 Error: Output file not found: $outputFilePath"
@@ -284,22 +288,41 @@ $basFiles | ForEach-Object {
 
 # Save the document
 Write-Host "Saving document..."
+$oldFilePath = ""
 try {
-    if ($officeAppName -eq "PowerPoint" -or $officeAppName -eq "Word") {
+    if ($officeAppName -eq "Word") {
         # For PowerPoint, use SaveAs with the same file name to force save
         $doc.SaveAs($outputFilePath)
         Write-Host "Document saved using SaveAs method"
+    } elseif ($officeAppName -eq "PowerPoint") {
+        # For PowerPoint, we need to check if the file name ends with .ppam.pptm
+        # If so, we need to save as .ppam
+        if ($outputFilePath.EndsWith(".ppam.pptm")) {
+            $oldFilePath = $outputFilePath
+            $outputFilePath = $outputFilePath -replace "\.ppam\.pptm$", ".ppam"
+            # Replace forward slashes with backslashes
+            $outputFilePath = $outputFilePath -replace "/", "\"
+            Write-Host "Saving document as .ppam: $outputFilePath"
+            $doc.SaveAs($outputFilePath, 18) # 18 is the ppSaveAsOpenXMLAddIn file format for .ppam
+            # Delete the .ppam.pptm file
+            Remove-Item -Path $oldFilePath -Force
+            Write-Host "Document saved as .ppam"
+        } else {
+            $doc.Save()
+            Write-Host "Document saved successfully"
+        }
     } elseif ($officeAppName -eq "Excel") {
         # For Excel, we need to check if the file name ends with .xlsb.xlsm
         # If so, we need to save as .xlsb
         if ($outputFilePath.EndsWith(".xlsb.xlsm")) {
-            $newFilePath = $outputFilePath -replace "\.xlsb\.xlsm$", ".xlsb"
+            $oldFilePath = $outputFilePath
+            $outputFilePath = $outputFilePath -replace "\.xlsb\.xlsm$", ".xlsb"
             # Replace forward slashes with backslashes
-            $newFilePath = $newFilePath -replace "/", "\"
-            Write-Host "Saving document as .xlsb: $newFilePath"
-            $doc.SaveAs($newFilePath, 50) # 50 is the xlExcel12 file format for .xlsb
+            $outputFilePath = $outputFilePath -replace "/", "\"
+            Write-Host "Saving document as .xlsb: $outputFilePath"
+            $doc.SaveAs($outputFilePath, 50) # 50 is the xlExcel12 file format for .xlsb
             # Delete the .xlsb.xlsm file
-            Remove-Item -Path $outputFilePath -Force
+            Remove-Item -Path $oldFilePath -Force
             Write-Host "Document saved as .xlsb"
         } else {
             $doc.Save()
@@ -316,8 +339,11 @@ try {
     # Alternative approach for PowerPoint if SaveAs fails
     if ($officeAppName -eq "PowerPoint") {
         try {
+
+            $ppFileExtension = $outputFilePath.Substring($outputFilePath.LastIndexOf('.') + 1)
+
             # Try saving with a temporary file name and then renaming
-            $tempPath = [System.IO.Path]::GetTempFileName() -replace '\.tmp$', '.pptm'
+            $tempPath = [System.IO.Path]::GetTempFileName() -replace '\.tmp$', ".$ppFileExtension"
             Write-Host "Attempting to save to temporary location: $tempPath"
             $doc.SaveAs($tempPath)
 
@@ -326,40 +352,71 @@ try {
             $officeApp.Quit()
 
             # Release COM objects
-            [System.Runtime.Interopservices.Marshal]::ReleaseComObject($doc) | Out-Null
-            [System.Runtime.Interopservices.Marshal]::ReleaseComObject($officeApp) | Out-Null
+            # Note: Initially, we were releasing the COM objects here, but since we want to use $doc later in the script to call the WriteToFile macro,
+            # we will not release them here. Instead, we will release them at the end of the script. Hopefully, this will still allow the SaveAs issue to be resolved.
+            # [System.Runtime.Interopservices.Marshal]::ReleaseComObject($doc) | Out-Null
+            # [System.Runtime.Interopservices.Marshal]::ReleaseComObject($officeApp) | Out-Null
 
             # Wait a moment for resources to be released
-            Start-Sleep -Seconds 2
+            Start-Sleep -Seconds 5
 
             # Copy the temp file to the intended destination
             Copy-Item -Path $tempPath -Destination $outputFilePath -Force
             Remove-Item -Path $tempPath -Force
-            
+                       
             Write-Host "Document saved using alternative method"
-            
-            # Skip the rest of the cleanup as we've already done it
-            Write-Host "VBA import completed successfully."
-            exit 0
+
+            if ($oldFilePath) {
+                # If we had an old file path, delete it
+                Remove-Item -Path $oldFilePath -Force
+                Write-Host "Old file deleted: $oldFilePath"
+            }
+
+            # Reopen the office application
+            $officeApp = New-Object -ComObject "$officeAppName.Application"
+            $officeApp.Visible = $true
+            Write-Host "Reopened $officeAppName application"
+
+            # Reopen the document, but if it's an Addin, we use Addins.Add then we load it
+            if ($outputFilePath.EndsWith(".ppam")) {
+                $doc = $officeApp.AddIns.Add($outputFilePath)
+            } else {
+                $doc = $officeApp.Presentations.Open($outputFilePath, $false, $false, $true) # ReadOnly, Untitled, WithWindow
+            }
+
+            Write-Host "Document reopened successfully after alternative save method"
+
         } catch {
             Write-Host "Error: Alternative save method also failed: $($_.Exception.Message)"
             Take-Screenshot -OutputPath "${screenshotDir}Screenshot_${fileNameNoExt}_{{timestamp}}.png"
         }
     }
 }
 
-# Generic test
+if ($officeAppName -eq "PowerPoint" -and $outputFilePath.EndsWith(".ppam")) {
+    # Check for and remove any PowerPoint Addin folder that might have been created
+    $presentationName = [System.IO.Path]::GetFileNameWithoutExtension($outputFilePath)
+    $presentationDir = [System.IO.Path]::GetDirectoryName($outputFilePath)
+    $possibleAddinFolder = Join-Path -Path $presentationDir -ChildPath $presentationName
+
+    if (Test-Path -Path $possibleAddinFolder -PathType Container) {
+        Write-Host "Removing auto-generated folder: $possibleAddinFolder"
+        Remove-Item -Path $possibleAddinFolder -Recurse -Force
+    }
+}
+
 # Call the WriteToFile macro to check if the module was imported correctly
 try {
 
-    $vbaModule = $doc.VBProject.VBComponents.Item(1)
-    if ($null -eq $vbaModule) {
-        Write-Host "Error: No VBA module found in the document."
-        Take-Screenshot -OutputPath "${screenshotDir}Screenshot_${fileNameNoExt}_{{timestamp}}.png"
-        exit 1
+    # Adding a slide duplication step similar to the working VBScript example from https://www.msofficeforums.com/powerpoint/23672-calling-macro-powerpoint-command-line.html#post74116
+    # This seems to be required for the macro to execute properly in PowerPoint
+    if ($fileExtension -eq "pptm") {
+        $Slide = $doc.Slides(1).Duplicate()
+    } elseif ($fileExtension -eq "ppam") {
+        # Ensure the Addin is loaded
+        $doc.Loaded = $true
     }
-    Write-Host "VBA module found: $($vbaModule.Name)"
-
+    
     $macroName = "WriteToFile"
     Write-Host "Macro to execute: $macroName"
     Write-Host "Application state before macro execution: Type=$($officeApp.GetType().FullName)"

scripts/Rename-It.ps1

@@ -26,6 +26,11 @@ if ($fileExtension -eq "xlsb") {
     $fileExtension = "xlsb.xlsm"
 }
 
+# Since we can't edit the .ppam file directly, we will use the .pptm file extension
+if ($fileExtension -eq "ppam") {
+    $fileExtension = "ppam.pptm"
+}
+
 # Create a copy of the zip/document file in the $folderName/Skeleton folder at the top level
 $copySource = "$folderName/Skeleton/$fileName.$ext"
 $renameDestinationFolder = "$sourceDir/out"

tests/PowerPointAddin.ppam/Modules/Module1.bas

@@ -0,0 +1,46 @@
+Attribute VB_Name = "Module1"
+
+'@Lang VBA
+Option Explicit
+
+Sub Demo()
+    MsgBox "Hello, World!"
+End Sub
+
+'This code will be called via COM to test if the VBA import was successful
+Sub WriteToFile()
+    Dim filePath As String
+    Dim fileNum As Integer
+    
+    ' Specify the path to the text file
+    filePath = ThisAddin.Path & "\PowerPointAddin.txt"
+    
+    ' Get a free file number
+    fileNum = FreeFile
+    
+    ' Open the file for output
+    Open filePath For Output As #fileNum
+    
+    ' Write some text to the file
+    Print #fileNum, "Hello, World!"
+    
+    ' Close the file
+    Close #fileNum
+End Sub
+
+Private Function ThisAddin() As PowerPoint.Addin
+    ' This function returns the current Addin object
+    ' It is used to access the Addin's properties and methods
+    Dim addin As PowerPoint.Addin
+
+    For Each addin In Application.AddIns
+        If addin.Name = "PowerPointAddin" Then
+            Set ThisAddin = addin
+            Exit Function
+        End If
+    Next addin
+    ' If the addin is not found, return Nothing
+    Set ThisAddin = Nothing
+    Exit Function
+
+End Function

tests/PowerPointAddin.ppam/XMLsource/[Content_Types].xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="jpeg" ContentType="image/jpeg" />
+  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml" />
+  <Default Extension="xml" ContentType="application/xml" />
+  <Override PartName="/ppt/presentation.xml" ContentType="application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" />
+  <Override PartName="/ppt/slideMasters/slideMaster1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml" />
+  <Override PartName="/ppt/slides/slide1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slide+xml" />
+  <Override PartName="/ppt/presProps.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.presProps+xml" />
+  <Override PartName="/ppt/viewProps.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml" />
+  <Override PartName="/ppt/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml" />
+  <Override PartName="/ppt/tableStyles.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout2.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout3.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout4.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout5.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout6.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout7.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout8.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout9.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout10.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/ppt/slideLayouts/slideLayout11.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" />
+  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml" />
+  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml" />
+</Types>

tests/PowerPointAddin.ppam/XMLsource/_rels/.rels

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml" />
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail" Target="docProps/thumbnail.jpeg" />
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="ppt/presentation.xml" />
+  <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml" />
+</Relationships>

tests/PowerPointAddin.ppam/XMLsource/docProps/app.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
+  <TotalTime>2</TotalTime>
+  <Words>0</Words>
+  <Application>Microsoft Office PowerPoint</Application>
+  <PresentationFormat>Widescreen</PresentationFormat>
+  <Paragraphs>0</Paragraphs>
+  <Slides>1</Slides>
+  <Notes>0</Notes>
+  <HiddenSlides>0</HiddenSlides>
+  <MMClips>0</MMClips>
+  <ScaleCrop>false</ScaleCrop>
+  <HeadingPairs>
+    <vt:vector size="6" baseType="variant">
+      <vt:variant>
+        <vt:lpstr>Fonts Used</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>3</vt:i4>
+      </vt:variant>
+      <vt:variant>
+        <vt:lpstr>Theme</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>1</vt:i4>
+      </vt:variant>
+      <vt:variant>
+        <vt:lpstr>Slide Titles</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>1</vt:i4>
+      </vt:variant>
+    </vt:vector>
+  </HeadingPairs>
+  <TitlesOfParts>
+    <vt:vector size="5" baseType="lpstr">
+      <vt:lpstr>Aptos</vt:lpstr>
+      <vt:lpstr>Aptos Display</vt:lpstr>
+      <vt:lpstr>Arial</vt:lpstr>
+      <vt:lpstr>Office Theme</vt:lpstr>
+      <vt:lpstr>PowerPoint Presentation</vt:lpstr>
+    </vt:vector>
+  </TitlesOfParts>
+  <Company>
+  </Company>
+  <LinksUpToDate>false</LinksUpToDate>
+  <SharedDoc>false</SharedDoc>
+  <HyperlinksChanged>false</HyperlinksChanged>
+  <AppVersion>16.0000</AppVersion>
+</Properties>

tests/PowerPointAddin.ppam/XMLsource/docProps/core.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <dc:title>
+  </dc:title>
+  <dc:creator>Martin Leduc</dc:creator>
+  <cp:lastModifiedBy>Martin Leduc</cp:lastModifiedBy>
+  <cp:revision>1</cp:revision>
+  <dcterms:created xsi:type="dcterms:W3CDTF">2025-04-19T01:26:16Z</dcterms:created>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2025-04-19T01:28:20Z</dcterms:modified>
+</cp:coreProperties>

tests/PowerPointAddin.ppam/XMLsource/docProps/thumbnail.jpeg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/presProps" Target="presProps.xml" />
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide1.xml" />
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="slideMasters/slideMaster1.xml" />
+  <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles" Target="tableStyles.xml" />
+  <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml" />
+  <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/viewProps" Target="viewProps.xml" />
+</Relationships>