From 53394a8a32e371397f7de4104ba2207ff141d29b Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Sat, 23 Sep 2023 09:03:00 -0400
Subject: [PATCH 01/73] Updating clsPerformance, as some objects never restart
 timing, and when resetting some objects are not cleared. Fixes #331

---
 .../modules/clsPerformance.cls                | 185 +++++++++++++++++-
 1 file changed, 179 insertions(+), 6 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index 1621c427..c3ac1779 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -20,6 +20,7 @@ Attribute VB_Exposed = False
 '           : microsecond level. For additional details, see the following link:
 '           : http://www.mendipdatasystems.co.uk/timer-comparison-tests/4594552971
 '---------------------------------------------------------------------------------------
+
 Option Compare Database
 Option Explicit
 
@@ -76,6 +77,7 @@ End Sub
 Public Property Get CallStack() As String
 
     Dim lngCallStackPosition As Long
+    Dim strCallStackElement As String
 
     If Not Me.Enabled Then Exit Property
 
@@ -96,6 +98,11 @@ Public Property Get CallStack() As String
 End Property
 
 
+Public Property Get CurrentCategoryName() As String
+    CurrentCategoryName = this.CategoryName
+End Property
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : CategoryStart
 ' Author    : Adam Waller
@@ -105,15 +112,15 @@ End Property
 '
 Public Sub CategoryStart(strName As String)
     If Not Me.Enabled Then Exit Sub
-    If this.CategoryName <> vbNullString Then CategoryEnd
     If this.Categories Is Nothing Then Set this.Categories = New Dictionary
+    If this.CategoryName <> vbNullString Then CategoryEnd
     StartTimer this.Categories, strName
     this.CategoryName = strName
 End Sub
 
 
 '---------------------------------------------------------------------------------------
-' Procedure : ComponentEnd
+' Procedure : CategoryEnd
 ' Author    : Adam Waller
 ' Date      : 11/3/2020
 ' Purpose   : End the timing of the active component
@@ -128,6 +135,11 @@ Public Sub CategoryEnd(Optional lngCount As Long = 1)
 End Sub
 
 
+Public Property Get CurrentOperationName() As String
+    CurrentOperationName = this.OperationName
+End Property
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : OperationStart
 ' Author    : Adam Waller
@@ -199,6 +211,8 @@ Public Sub OperationEnd(Optional lngCount As Long = 1)
                     this.OperationName = vbNullString
                 End If
             End With
+        Else
+            this.OperationName = vbNullString
         End If
     End If
 
@@ -331,6 +345,9 @@ Public Sub ResumeTiming()
     ' Resume current operation
     If this.OperationName <> vbNullString Then StartTimer this.Operations, this.OperationName
 
+    ' Resume current Category
+    If this.CategoryName <> vbNullString Then StartTimer this.Categories, this.CategoryName
+
 End Sub
 
 
@@ -439,6 +456,9 @@ Public Function GetReports() As String
                 curTotal = curTotal + this.Operations(varKey).Total
             Next varKey
             .Add strSpacer
+            .Add ListResult("TOTALS:", CStr(dblCount), _
+                Format(curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
+            .Add strSpacer
             If Not this.Overall Is Nothing Then
                 .Add ListResult("Other Operations", vbNullString, _
                     Format(this.Overall.Total - curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
@@ -479,10 +499,163 @@ End Function
 '           : MyFancyTest      23     2.45
 '---------------------------------------------------------------------------------------
 '
-Private Function ListResult(strHeading As String, strResult1 As String, strResult2 As String, _
-    lngCol() As Long) As String
-    ListResult = PadRight(strHeading, lngCol(0)) & _
-        PadRight(strResult1, lngCol(1)) & strResult2
+Public Function ListResult(ByRef strHeading As String _
+                            , ByRef strResult1 As String _
+                            , ByRef strResult2 As String _
+                            , ByRef lngCol() As Long) As String
+    ListResult = ListResultIndent(strHeading, strResult1, strResult2, lngCol)
+End Function
+
+
+Public Function ListResultIndent(ByRef strHeading As String _
+                                , ByRef strResult1 As String _
+                                , ByRef strResult2 As String _
+                                , ByRef lngCol() As Long _
+                                , Optional ByVal ColumnIndent As Long = 2) As String
+
+    Dim Col1StrArr() As String
+    Dim Col2StrArr() As String
+    Dim Col3StrArr() As String
+
+    Dim Col1Rows As Long
+    Dim Col2Rows As Long
+    Dim Col3Rows As Long
+
+    Dim RowTotal As Long
+    Dim RowPosition As Long
+
+    Dim StrOutput As clsConcat
+
+    On Error Resume Next
+    Perf.OperationStart ModuleName & ".ListResultIndent"
+
+    Col1StrArr = FitStringToColumn(strHeading, lngCol(0) - 1, ColumnIndent)
+    Col2StrArr = FitStringToColumn(strResult1, lngCol(1) - 1, ColumnIndent)
+    Col3StrArr = FitStringToColumn(strResult2, lngCol(2) - 1, ColumnIndent)
+
+    Col1Rows = UBound(Col1StrArr)
+    Col2Rows = UBound(Col2StrArr)
+    Col3Rows = UBound(Col3StrArr)
+
+    RowTotal = MaxValue(Col1Rows, Col2Rows, Col3Rows)
+
+    Set StrOutput = New clsConcat
+
+    For RowPosition = 0 To RowTotal
+
+        If Col1Rows >= RowPosition Then
+            StrOutput.Add PadRight(Col1StrArr(RowPosition), lngCol(0))
+        Else
+            StrOutput.Add Space$(lngCol(0))
+        End If
+        If Col2Rows >= RowPosition Then
+            StrOutput.Add PadRight(Col2StrArr(RowPosition), lngCol(1))
+        Else
+            StrOutput.Add Space$(lngCol(1))
+        End If
+        If Col3Rows >= RowPosition Then
+            StrOutput.Add PadRight(Col3StrArr(RowPosition), lngCol(2))
+        Else
+            StrOutput.Add Space$(lngCol(2))
+        End If
+        ' Don't add a new line for the last line; it's handled outside this tool
+        If RowTotal > RowPosition Then StrOutput.Add vbNewLine
+
+    Next RowPosition
+
+    ListResultIndent = StrOutput.GetStr
+    Perf.OperationEnd
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : FitStringToColumn
+' Author    : hecon5
+' Date      : May 18, 2022
+' Purpose   : Takes in a long string and returns an array of strings ColumnWidth wide.
+'---------------------------------------------------------------------------------------
+'
+Public Function FitStringToColumn(ByRef LongString As String _
+                                , Optional ByRef ColumnWidth As Long = 200 _
+                                , Optional ByRef ColumnIndent As Long = 0) As String()
+
+    Dim RowTotal As Long
+    Dim StrLen As Long
+    Dim StrIndentedLen As Long
+    Dim StrTextWidth As Long
+    Dim StrPosition As Long
+    Dim ArrPosition As Long
+    Dim StrArr() As String
+    Dim ColumnWidthInternal As Long
+
+    On Error Resume Next
+    Perf.OperationStart ModuleName & ".FitStringToColumn"
+    If Len(LongString) = 0 Then Exit Function
+    ColumnWidthInternal = ColumnWidth
+    If ColumnWidthInternal <= 0 Then ColumnWidthInternal = 1
+
+    StrTextWidth = ColumnWidthInternal - ColumnIndent
+
+    StrLen = Len(LongString)
+    RowTotal = RoundUp((StrLen - ColumnWidthInternal) / StrTextWidth) + 1
+    If RowTotal < 1 Then RowTotal = 1
+    StrPosition = 1
+
+    ReDim StrArr(0 To (RowTotal - 1))
+
+    ' The first row is longer.
+    StrArr(ArrPosition) = Mid$(LongString, StrPosition, ColumnWidthInternal)
+    If RowTotal <= 1 Then GoTo Exit_Here ' Don't do the rest if there's only one row...
+
+    StrPosition = StrPosition + ColumnWidthInternal
+
+    For ArrPosition = 1 To (RowTotal - 1)
+        StrArr(ArrPosition) = Space$(ColumnIndent) & Mid$(LongString, StrPosition, StrTextWidth)
+        StrPosition = StrPosition + StrTextWidth
+    Next ArrPosition
+
+Exit_Here:
+    CatchAny eelError, "Could not fit to column", Perf.CurrentOperationName
+    FitStringToColumn = StrArr
+    Perf.OperationEnd
+End Function
+
+
+Public Function FitStringToWidth(ByRef LongString As String _
+                                , Optional ByRef MaxWidth As Long = 200 _
+                                , Optional ByRef DesiredWidth As Long = 75) As String
+    ' Fits a string to a message box if it's wider than MaxWidth
+    Dim OutputConcat As clsConcat
+    Dim StrPosition As Long
+    Dim StrLen As Long ' Length of total string
+    Dim NewLineCount As Long ' Number of newlines
+    Dim ArrPosition As Long
+    Dim StrArrLen As Long ' Length of substring
+    Dim StringArr() As String
+
+    Perf.OperationStart "FitStringToWidth"
+    StrLen = Len(LongString)
+    If StrLen > MaxWidth Then
+        Perf.OperationStart "FitStringToWidth.Resize"
+        StringArr = Split(LongString, vbNewLine, , vbTextCompare)
+        NewLineCount = UBound(StringArr) - LBound(StringArr)
+        Set OutputConcat = New clsConcat
+        For ArrPosition = 0 To NewLineCount
+            StrPosition = 1
+            StrArrLen = Len(StringArr(ArrPosition))
+            If ArrPosition > 0 Then OutputConcat.Add vbNewLine
+            Do While StrPosition < StrArrLen
+                If StrPosition > 1 Then OutputConcat.Add vbNewLine
+                OutputConcat.Add Mid$(StringArr(ArrPosition), StrPosition, DesiredWidth)
+                StrPosition = StrPosition + DesiredWidth
+            Loop
+        Next ArrPosition
+        FitStringToWidth = OutputConcat.GetStr
+        Perf.OperationEnd
+    Else
+        FitStringToWidth = LongString
+    End If
+    Perf.OperationEnd
 End Function
 
 

From 4a27077e2d2843d901fe9860d795df32912bb4a6 Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Sat, 23 Sep 2023 09:19:57 -0400
Subject: [PATCH 02/73] Fixing Private/Public declarations.

---
 .../modules/clsPerformance.cls                | 84 +++++++++++++------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index c3ac1779..3f345019 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -499,7 +499,7 @@ End Function
 '           : MyFancyTest      23     2.45
 '---------------------------------------------------------------------------------------
 '
-Public Function ListResult(ByRef strHeading As String _
+Private Function ListResult(ByRef strHeading As String _
                             , ByRef strResult1 As String _
                             , ByRef strResult2 As String _
                             , ByRef lngCol() As Long) As String
@@ -507,7 +507,7 @@ Public Function ListResult(ByRef strHeading As String _
 End Function
 
 
-Public Function ListResultIndent(ByRef strHeading As String _
+Private Function ListResultIndent(ByRef strHeading As String _
                                 , ByRef strResult1 As String _
                                 , ByRef strResult2 As String _
                                 , ByRef lngCol() As Long _
@@ -524,10 +524,9 @@ Public Function ListResultIndent(ByRef strHeading As String _
     Dim RowTotal As Long
     Dim RowPosition As Long
 
-    Dim StrOutput As clsConcat
+    Dim strOutput As clsConcat
 
     On Error Resume Next
-    Perf.OperationStart ModuleName & ".ListResultIndent"
 
     Col1StrArr = FitStringToColumn(strHeading, lngCol(0) - 1, ColumnIndent)
     Col2StrArr = FitStringToColumn(strResult1, lngCol(1) - 1, ColumnIndent)
@@ -539,32 +538,74 @@ Public Function ListResultIndent(ByRef strHeading As String _
 
     RowTotal = MaxValue(Col1Rows, Col2Rows, Col3Rows)
 
-    Set StrOutput = New clsConcat
+    Set strOutput = New clsConcat
 
     For RowPosition = 0 To RowTotal
 
         If Col1Rows >= RowPosition Then
-            StrOutput.Add PadRight(Col1StrArr(RowPosition), lngCol(0))
+            strOutput.Add PadRight(Col1StrArr(RowPosition), lngCol(0))
         Else
-            StrOutput.Add Space$(lngCol(0))
+            strOutput.Add Space$(lngCol(0))
         End If
         If Col2Rows >= RowPosition Then
-            StrOutput.Add PadRight(Col2StrArr(RowPosition), lngCol(1))
+            strOutput.Add PadRight(Col2StrArr(RowPosition), lngCol(1))
         Else
-            StrOutput.Add Space$(lngCol(1))
+            strOutput.Add Space$(lngCol(1))
         End If
         If Col3Rows >= RowPosition Then
-            StrOutput.Add PadRight(Col3StrArr(RowPosition), lngCol(2))
+            strOutput.Add PadRight(Col3StrArr(RowPosition), lngCol(2))
         Else
-            StrOutput.Add Space$(lngCol(2))
+            strOutput.Add Space$(lngCol(2))
         End If
         ' Don't add a new line for the last line; it's handled outside this tool
-        If RowTotal > RowPosition Then StrOutput.Add vbNewLine
+        If RowTotal > RowPosition Then strOutput.Add vbNewLine
 
     Next RowPosition
 
-    ListResultIndent = StrOutput.GetStr
-    Perf.OperationEnd
+    ListResultIndent = strOutput.GetStr
+End Function
+
+
+Private Function MaxValue(ParamArray ValueIn() As Variant) As Variant
+    Dim Output As Variant
+    Dim ArrayPosition As Long
+
+    ' Load the first value in to compare to.
+    Output = ValueIn(LBound(ValueIn))
+
+    For ArrayPosition = LBound(ValueIn) + 1 To UBound(ValueIn)
+        If Output < ValueIn(ArrayPosition) Then Output = ValueIn(ArrayPosition)
+    Next ArrayPosition
+
+    MaxValue = Output
+End Function
+
+
+Private Function RoundUp(ByVal Value As Double) As Long
+    Dim lngVal As Long
+    Dim deltaValue As Double
+
+    lngVal = CLng(Value)
+    deltaValue = lngVal - Value
+
+    If deltaValue < 0 Then
+        RoundUp = lngVal + 1
+    Else
+        RoundUp = lngVal
+    End If
+End Function
+Private Function RoundDown(ByVal Value As Double) As Long
+    Dim lngVal As Long
+    Dim deltaValue As Double
+
+    lngVal = CLng(Value)
+    deltaValue = lngVal - Value
+
+    If deltaValue <= 0 Then
+        RoundDown = lngVal
+    Else
+        RoundDown = lngVal - 1
+    End If
 End Function
 
 
@@ -575,7 +616,7 @@ End Function
 ' Purpose   : Takes in a long string and returns an array of strings ColumnWidth wide.
 '---------------------------------------------------------------------------------------
 '
-Public Function FitStringToColumn(ByRef LongString As String _
+Private Function FitStringToColumn(ByRef LongString As String _
                                 , Optional ByRef ColumnWidth As Long = 200 _
                                 , Optional ByRef ColumnIndent As Long = 0) As String()
 
@@ -589,7 +630,6 @@ Public Function FitStringToColumn(ByRef LongString As String _
     Dim ColumnWidthInternal As Long
 
     On Error Resume Next
-    Perf.OperationStart ModuleName & ".FitStringToColumn"
     If Len(LongString) = 0 Then Exit Function
     ColumnWidthInternal = ColumnWidth
     If ColumnWidthInternal <= 0 Then ColumnWidthInternal = 1
@@ -615,13 +655,11 @@ Public Function FitStringToColumn(ByRef LongString As String _
     Next ArrPosition
 
 Exit_Here:
-    CatchAny eelError, "Could not fit to column", Perf.CurrentOperationName
     FitStringToColumn = StrArr
-    Perf.OperationEnd
 End Function
 
 
-Public Function FitStringToWidth(ByRef LongString As String _
+Private Function FitStringToWidth(ByRef LongString As String _
                                 , Optional ByRef MaxWidth As Long = 200 _
                                 , Optional ByRef DesiredWidth As Long = 75) As String
     ' Fits a string to a message box if it's wider than MaxWidth
@@ -633,10 +671,8 @@ Public Function FitStringToWidth(ByRef LongString As String _
     Dim StrArrLen As Long ' Length of substring
     Dim StringArr() As String
 
-    Perf.OperationStart "FitStringToWidth"
     StrLen = Len(LongString)
     If StrLen > MaxWidth Then
-        Perf.OperationStart "FitStringToWidth.Resize"
         StringArr = Split(LongString, vbNewLine, , vbTextCompare)
         NewLineCount = UBound(StringArr) - LBound(StringArr)
         Set OutputConcat = New clsConcat
@@ -651,11 +687,9 @@ Public Function FitStringToWidth(ByRef LongString As String _
             Loop
         Next ArrPosition
         FitStringToWidth = OutputConcat.GetStr
-        Perf.OperationEnd
     Else
         FitStringToWidth = LongString
     End If
-    Perf.OperationEnd
 End Function
 
 
@@ -666,7 +700,9 @@ End Function
 ' Purpose   : Pads a string
 '---------------------------------------------------------------------------------------
 '
-Private Function PadRight(strText As String, lngLen As Long, Optional lngMinTrailingSpaces As Long = 1) As String
+Private Function PadRight(strText As String _
+                        , lngLen As Long _
+                        , Optional lngMinTrailingSpaces As Long = 1) As String
 
     Dim strResult As String
     Dim strTrimmed As String

From bd2453851852ee993118b01788c549021bf09f7f Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Sat, 23 Sep 2023 09:21:13 -0400
Subject: [PATCH 03/73] This isn't actually used.

---
 Version Control.accda.src/modules/clsPerformance.cls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index 3f345019..7ef5bc1f 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -77,7 +77,6 @@ End Sub
 Public Property Get CallStack() As String
 
     Dim lngCallStackPosition As Long
-    Dim strCallStackElement As String
 
     If Not Me.Enabled Then Exit Property
 

From 6e8007a4fe57d34df86aba93441573c2037c3646 Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Sat, 23 Sep 2023 09:26:30 -0400
Subject: [PATCH 04/73] Bump Version

---
 Version Control.accda.src/dbs-properties.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index 9c197f0f..0f394126 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.22",
+      "Value": "4.0.24",
       "Type": 10
     },
     "Auto Compact": {

From 62fde81a442197c48a7f5919f097bbc802ba22d0 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:19:38 -0500
Subject: [PATCH 05/73] Update API examples

Removed dependency on an external function, and added an example for building from source.
---
 Version Control.accda.src/modules/modAPI.bas | 60 +++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modAPI.bas b/Version Control.accda.src/modules/modAPI.bas
index b6a230ca..99daca10 100644
--- a/Version Control.accda.src/modules/modAPI.bas	
+++ b/Version Control.accda.src/modules/modAPI.bas	
@@ -220,7 +220,7 @@ Public Function ExampleLoadAddInAndRunExport()
     Dim objAddIn As Object  ' VBProject
 
     ' Build default add-in path
-    strAddInPath = GetAddInFileName
+    strAddInPath = Environ$("AppData") & "\MSAccessVCS\Version Control.accda"
 
     ' See if add-in project is already loaded.
     For Each proj In VBE.VBProjects
@@ -256,3 +256,61 @@ Public Function ExampleLoadAddInAndRunExport()
     End If
 
 End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : ExampleBuildFromSource
+' Author    : Adam Waller
+' Date      : 9/6/2023
+' Purpose   : This function can be copied to a local database and triggered with a
+'           : command line argument or other automation technique to load the VCS
+'           : add-in file and build this project from source.
+'           : NOTE: This expects the add-in to be installed in the default location
+'           : and using the default file name.
+'---------------------------------------------------------------------------------------
+'
+Public Function ExampleBuildFromSource()
+
+    Dim strAddInPath As String
+    Dim proj As Object      ' VBProject
+    Dim objAddIn As Object  ' VBProject
+
+    ' Build default add-in path
+    strAddInPath = Environ$("AppData") & "\MSAccessVCS\Version Control.accda"
+
+    ' See if add-in project is already loaded.
+    For Each proj In VBE.VBProjects
+        If StrComp(proj.FileName, strAddInPath, vbTextCompare) = 0 Then
+            Set objAddIn = proj
+        End If
+    Next proj
+
+    ' If not loaded, then attempt to load the add-in.
+    If objAddIn Is Nothing Then
+
+        ' The following lines will load the add-in at the application level,
+        ' but will not actually call the function. Ignore the error of function not found.
+        ' https://stackoverflow.com/questions/62270088/how-can-i-launch-an-access-add-in-not-com-add-in-from-vba-code
+        On Error Resume Next
+        Application.Run strAddInPath & "!DummyFunction"
+        On Error GoTo 0
+
+        ' See if it is loaded now...
+        For Each proj In VBE.VBProjects
+            If StrComp(proj.FileName, strAddInPath, vbTextCompare) = 0 Then
+                Set objAddIn = proj
+            End If
+        Next proj
+    End If
+
+    If objAddIn Is Nothing Then
+        MsgBox "Unable to load Version Control add-in. Please ensure that it has been installed" & vbCrLf & _
+            "and is functioning correctly. (It should be available in the Add-ins menu.)", vbExclamation
+    Else
+        ' Set the application interaction level to silent to skip confirmation dialogs.
+        Application.Run "MSAccessVCS.SetInteractionMode", 1
+        ' Launch the build process (as if we clicked the button on the ribbon)
+        Application.Run "MSAccessVCS.HandleRibbonCommand", "btnBuild"
+    End If
+
+End Function

From 3273089c3255a84a270e6c205f42a775e30e4da3 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:29:03 -0500
Subject: [PATCH 06/73] Refine some dialect-specific SQL string quotations

Backticks only apply to MySQL, while square brackets are used with MSSQL and Access. #442
---
 .../modules/clsSqlFormatter.cls               | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index 517f9ae3..423794b8 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -720,7 +720,9 @@ End Function
 ' Procedure : GetQuotedString
 ' Author    : Adam Waller
 ' Date      : 8/12/2023
-' Purpose   : Return a quoted string (Applies four possible rules)
+' Purpose   : Return a quoted string (dialect-specific)
+'           : https://stackoverflow.com/q/10573922/4121863
+'           : https://stackoverflow.com/q/9719869/4121863
 '---------------------------------------------------------------------------------------
 '
 Private Function GetQuotedString(Optional lngStartOffset As Long = 0) As String
@@ -733,26 +735,28 @@ Private Function GetQuotedString(Optional lngStartOffset As Long = 0) As String
         ' Build out RegEx expression
         .Add "^("
 
-            ' (1) backtick quoted string using `` to escape
-            .Add "((`[^`]*($|`))+)|"
-
-            ' (2) square bracket quoted string (SQL Server) using ]] to escape
-            .Add "((\[[^\]]*($|\]))(\][^\]]*($|\]))*)|"
-
+            ' Accomodate dialect-specific variants
             Select Case m_intDialect
+
                 Case esdMySQL
-                    ' (3) double quoted string using "" or \" to escape
+                    ' Backtick quoted string using `` to escape
+                    .Add "((`[^`]*($|`))+)|"
+
+                    ' Double quoted string using "" or \" to escape
                     .Add "((""[^""\\\\]*(?:\\\\.[^""\\\\]*)*(""|$))+)|"
 
-                    ' (4) single quoted string using '' or \' to escape
-                    .Add "((\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*(\'|$))+)"      ' sx',
+                    ' Single quoted string using '' or \' to escape
+                    .Add "((\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*(\'|$))+)"
 
                 Case Else
-                    ' (3) double quoted string using "" to escape
+                    ' Square bracket quoted string (SQL Server) using ]] to escape
+                    .Add "((\[[^\]]*($|\]))(\][^\]]*($|\]))*)|"
+
+                    ' Double quoted string using "" to escape
                     .Add "((""[^""]*(""|$))+)|"
 
-                    ' (4) single quoted string using '' to escape
-                    .Add "((\'[^\']*(\'|$))+)"      ' sx',
+                    ' Single quoted string using '' to escape
+                    .Add "((\'[^\']*(\'|$))+)"
 
             End Select
         .Add ")"

From 1cda77474b798e2462b93b78f7e9a765a14a9d83 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 19 Oct 2023 14:02:29 -0500
Subject: [PATCH 07/73] Allow wrapping of long names in performance class

Extending the performance class to allow the wrapping of long names used for categories or operations. (Not really needed within this project, but could potentially be helpful in the future with translations.) #441
---
 .../modules/clsPerformance.cls                | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index 1621c427..4644c35e 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -474,15 +474,49 @@ End Function
 ' Author    : Adam Waller
 ' Date      : 11/3/2020
 ' Purpose   : List the result of a test in a fixed width format. The result strings
-'           : are positioned at the number of characters specified.
+'           : are positioned at the number of characters specified. If the heading size
+'           : exceeds the width of the column, the text will be wrapped.
 '           : I.e:
 '           : MyFancyTest      23     2.45
+'           : My very long nam
+'           : e that I probabl
+'           : y should condens
+'           : e                12     3.23
 '---------------------------------------------------------------------------------------
 '
 Private Function ListResult(strHeading As String, strResult1 As String, strResult2 As String, _
     lngCol() As Long) As String
-    ListResult = PadRight(strHeading, lngCol(0)) & _
-        PadRight(strResult1, lngCol(1)) & strResult2
+
+    Dim strRowHeading As String
+    Dim lngPos As Long
+    Dim intMax As Integer
+
+    ' Wrap at one character less than the column width
+    intMax = lngCol(0) - 1
+
+    ' Use concatenation class in case we need to deal with line wrapping
+    With New clsConcat
+
+        ' Check for size overflow on heading. (Wrap on multiple lines)
+        strRowHeading = strHeading
+        If Len(strRowHeading) > intMax Then
+            lngPos = 1
+            Do While lngPos + intMax <= Len(strHeading)
+                ' Add segment and linebreak
+                .Add Mid$(strHeading, lngPos, intMax), " ", vbCrLf
+                lngPos = lngPos + intMax
+            Loop
+            ' Get last heading line to use with results
+            strRowHeading = Mid$(strHeading, lngPos)
+        End If
+
+        ' Display heading and amounts
+        .Add PadRight(strRowHeading, lngCol(0))
+        .Add PadRight(strResult1, lngCol(1))
+        .Add strResult2
+        ListResult = .GetStr
+    End With
+
 End Function
 
 
@@ -538,7 +572,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     ' Build our list of records
     For Each varKey In dItems.Keys
         ' Create a record like this: "00062840.170000|Export Form Objects       ..."
-        strRecord = Format(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 100)
+        strRecord = Format(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 255)
         ' Add to array.
         varItems(lngCnt) = strRecord
         ' Increment counter for array

From eae289b42e1d0d8aa0bc12d48dbdbcc5dda7f1ef Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Thu, 19 Oct 2023 15:41:03 -0400
Subject: [PATCH 08/73] Update based on feedback from @joyfullservice.

---
 .../modules/clsPerformance.cls                | 253 ++++--------------
 1 file changed, 57 insertions(+), 196 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index 7ef5bc1f..17fd8bdf 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -96,7 +96,13 @@ Public Property Get CallStack() As String
 
 End Property
 
-
+'---------------------------------------------------------------------------------------
+' Procedure : CurrentCategoryName
+' Author    : hecon5
+' Date      : 10/3/2023
+' Purpose   : Return the current category name.
+'---------------------------------------------------------------------------------------
+'
 Public Property Get CurrentCategoryName() As String
     CurrentCategoryName = this.CategoryName
 End Property
@@ -134,11 +140,6 @@ Public Sub CategoryEnd(Optional lngCount As Long = 1)
 End Sub
 
 
-Public Property Get CurrentOperationName() As String
-    CurrentOperationName = this.OperationName
-End Property
-
-
 '---------------------------------------------------------------------------------------
 ' Procedure : OperationStart
 ' Author    : Adam Waller
@@ -218,6 +219,18 @@ Public Sub OperationEnd(Optional lngCount As Long = 1)
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : CurrentOperationName
+' Author    : hecon5
+' Date      : 10/3/2023
+' Purpose   : Return the current operation's name.
+'---------------------------------------------------------------------------------------
+'
+Public Property Get CurrentOperationName() As String
+    CurrentOperationName = this.OperationName
+End Property
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : DigitsAfterDecimal
 ' Author    : Eugen Albiker
@@ -273,7 +286,9 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Private Sub StartTimer(dItems As Dictionary, strName As String)
+
     Dim cItem As clsPerformanceItem
+
     If Not dItems.Exists(strName) Then
         Set cItem = New clsPerformanceItem
         dItems.Add strName, cItem
@@ -455,9 +470,6 @@ Public Function GetReports() As String
                 curTotal = curTotal + this.Operations(varKey).Total
             Next varKey
             .Add strSpacer
-            .Add ListResult("TOTALS:", CStr(dblCount), _
-                Format(curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
-            .Add strSpacer
             If Not this.Overall Is Nothing Then
                 .Add ListResult("Other Operations", vbNullString, _
                     Format(this.Overall.Total - curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
@@ -493,202 +505,51 @@ End Function
 ' Author    : Adam Waller
 ' Date      : 11/3/2020
 ' Purpose   : List the result of a test in a fixed width format. The result strings
-'           : are positioned at the number of characters specified.
+'           : are positioned at the number of characters specified. If the heading size
+'           : exceeds the width of the column, the text will be wrapped.
 '           : I.e:
 '           : MyFancyTest      23     2.45
+'           : My very long nam
+'           : e that I probabl
+'           : y should condens
+'           : e                12     3.23
 '---------------------------------------------------------------------------------------
 '
-Private Function ListResult(ByRef strHeading As String _
-                            , ByRef strResult1 As String _
-                            , ByRef strResult2 As String _
-                            , ByRef lngCol() As Long) As String
-    ListResult = ListResultIndent(strHeading, strResult1, strResult2, lngCol)
-End Function
-
-
-Private Function ListResultIndent(ByRef strHeading As String _
-                                , ByRef strResult1 As String _
-                                , ByRef strResult2 As String _
-                                , ByRef lngCol() As Long _
-                                , Optional ByVal ColumnIndent As Long = 2) As String
-
-    Dim Col1StrArr() As String
-    Dim Col2StrArr() As String
-    Dim Col3StrArr() As String
+Private Function ListResult(strHeading As String _
+                            , strResult1 As String _
+                            , strResult2 As String _
+                            , lngCol() As Long) As String
 
-    Dim Col1Rows As Long
-    Dim Col2Rows As Long
-    Dim Col3Rows As Long
+    Dim strRowHeading As String
+    Dim lngPos As Long
+    Dim intMax As Integer
 
-    Dim RowTotal As Long
-    Dim RowPosition As Long
+    ' Wrap at one character less than the column width
+    intMax = lngCol(0) - 1
 
-    Dim strOutput As clsConcat
-
-    On Error Resume Next
-
-    Col1StrArr = FitStringToColumn(strHeading, lngCol(0) - 1, ColumnIndent)
-    Col2StrArr = FitStringToColumn(strResult1, lngCol(1) - 1, ColumnIndent)
-    Col3StrArr = FitStringToColumn(strResult2, lngCol(2) - 1, ColumnIndent)
-
-    Col1Rows = UBound(Col1StrArr)
-    Col2Rows = UBound(Col2StrArr)
-    Col3Rows = UBound(Col3StrArr)
-
-    RowTotal = MaxValue(Col1Rows, Col2Rows, Col3Rows)
-
-    Set strOutput = New clsConcat
-
-    For RowPosition = 0 To RowTotal
+    ' Use concatenation class in case we need to deal with line wrapping
+    With New clsConcat
 
-        If Col1Rows >= RowPosition Then
-            strOutput.Add PadRight(Col1StrArr(RowPosition), lngCol(0))
-        Else
-            strOutput.Add Space$(lngCol(0))
-        End If
-        If Col2Rows >= RowPosition Then
-            strOutput.Add PadRight(Col2StrArr(RowPosition), lngCol(1))
-        Else
-            strOutput.Add Space$(lngCol(1))
-        End If
-        If Col3Rows >= RowPosition Then
-            strOutput.Add PadRight(Col3StrArr(RowPosition), lngCol(2))
-        Else
-            strOutput.Add Space$(lngCol(2))
+        ' Check for size overflow on heading. (Wrap on multiple lines)
+        strRowHeading = strHeading
+        If Len(strRowHeading) > intMax Then
+            lngPos = 1
+            Do While lngPos + intMax <= Len(strHeading)
+                ' Add segment and linebreak
+                .Add Mid$(strHeading, lngPos, intMax), " ", vbCrLf
+                lngPos = lngPos + intMax
+            Loop
+            ' Get last heading line to use with results
+            strRowHeading = Mid$(strHeading, lngPos)
         End If
-        ' Don't add a new line for the last line; it's handled outside this tool
-        If RowTotal > RowPosition Then strOutput.Add vbNewLine
-
-    Next RowPosition
-
-    ListResultIndent = strOutput.GetStr
-End Function
-
-
-Private Function MaxValue(ParamArray ValueIn() As Variant) As Variant
-    Dim Output As Variant
-    Dim ArrayPosition As Long
-
-    ' Load the first value in to compare to.
-    Output = ValueIn(LBound(ValueIn))
-
-    For ArrayPosition = LBound(ValueIn) + 1 To UBound(ValueIn)
-        If Output < ValueIn(ArrayPosition) Then Output = ValueIn(ArrayPosition)
-    Next ArrayPosition
-
-    MaxValue = Output
-End Function
-
-
-Private Function RoundUp(ByVal Value As Double) As Long
-    Dim lngVal As Long
-    Dim deltaValue As Double
-
-    lngVal = CLng(Value)
-    deltaValue = lngVal - Value
-
-    If deltaValue < 0 Then
-        RoundUp = lngVal + 1
-    Else
-        RoundUp = lngVal
-    End If
-End Function
-Private Function RoundDown(ByVal Value As Double) As Long
-    Dim lngVal As Long
-    Dim deltaValue As Double
-
-    lngVal = CLng(Value)
-    deltaValue = lngVal - Value
-
-    If deltaValue <= 0 Then
-        RoundDown = lngVal
-    Else
-        RoundDown = lngVal - 1
-    End If
-End Function
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : FitStringToColumn
-' Author    : hecon5
-' Date      : May 18, 2022
-' Purpose   : Takes in a long string and returns an array of strings ColumnWidth wide.
-'---------------------------------------------------------------------------------------
-'
-Private Function FitStringToColumn(ByRef LongString As String _
-                                , Optional ByRef ColumnWidth As Long = 200 _
-                                , Optional ByRef ColumnIndent As Long = 0) As String()
-
-    Dim RowTotal As Long
-    Dim StrLen As Long
-    Dim StrIndentedLen As Long
-    Dim StrTextWidth As Long
-    Dim StrPosition As Long
-    Dim ArrPosition As Long
-    Dim StrArr() As String
-    Dim ColumnWidthInternal As Long
-
-    On Error Resume Next
-    If Len(LongString) = 0 Then Exit Function
-    ColumnWidthInternal = ColumnWidth
-    If ColumnWidthInternal <= 0 Then ColumnWidthInternal = 1
-
-    StrTextWidth = ColumnWidthInternal - ColumnIndent
-
-    StrLen = Len(LongString)
-    RowTotal = RoundUp((StrLen - ColumnWidthInternal) / StrTextWidth) + 1
-    If RowTotal < 1 Then RowTotal = 1
-    StrPosition = 1
-
-    ReDim StrArr(0 To (RowTotal - 1))
-
-    ' The first row is longer.
-    StrArr(ArrPosition) = Mid$(LongString, StrPosition, ColumnWidthInternal)
-    If RowTotal <= 1 Then GoTo Exit_Here ' Don't do the rest if there's only one row...
-
-    StrPosition = StrPosition + ColumnWidthInternal
-
-    For ArrPosition = 1 To (RowTotal - 1)
-        StrArr(ArrPosition) = Space$(ColumnIndent) & Mid$(LongString, StrPosition, StrTextWidth)
-        StrPosition = StrPosition + StrTextWidth
-    Next ArrPosition
-
-Exit_Here:
-    FitStringToColumn = StrArr
-End Function
 
+        ' Display heading and amounts
+        .Add PadRight(strRowHeading, lngCol(0))
+        .Add PadRight(strResult1, lngCol(1))
+        .Add strResult2
+        ListResult = .GetStr
+    End With
 
-Private Function FitStringToWidth(ByRef LongString As String _
-                                , Optional ByRef MaxWidth As Long = 200 _
-                                , Optional ByRef DesiredWidth As Long = 75) As String
-    ' Fits a string to a message box if it's wider than MaxWidth
-    Dim OutputConcat As clsConcat
-    Dim StrPosition As Long
-    Dim StrLen As Long ' Length of total string
-    Dim NewLineCount As Long ' Number of newlines
-    Dim ArrPosition As Long
-    Dim StrArrLen As Long ' Length of substring
-    Dim StringArr() As String
-
-    StrLen = Len(LongString)
-    If StrLen > MaxWidth Then
-        StringArr = Split(LongString, vbNewLine, , vbTextCompare)
-        NewLineCount = UBound(StringArr) - LBound(StringArr)
-        Set OutputConcat = New clsConcat
-        For ArrPosition = 0 To NewLineCount
-            StrPosition = 1
-            StrArrLen = Len(StringArr(ArrPosition))
-            If ArrPosition > 0 Then OutputConcat.Add vbNewLine
-            Do While StrPosition < StrArrLen
-                If StrPosition > 1 Then OutputConcat.Add vbNewLine
-                OutputConcat.Add Mid$(StringArr(ArrPosition), StrPosition, DesiredWidth)
-                StrPosition = StrPosition + DesiredWidth
-            Loop
-        Next ArrPosition
-        FitStringToWidth = OutputConcat.GetStr
-    Else
-        FitStringToWidth = LongString
-    End If
 End Function
 
 
@@ -700,7 +561,7 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Private Function PadRight(strText As String _
-                        , lngLen As Long _
+                        , lngLen As Long _ 
                         , Optional lngMinTrailingSpaces As Long = 1) As String
 
     Dim strResult As String
@@ -746,7 +607,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     ' Build our list of records
     For Each varKey In dItems.Keys
         ' Create a record like this: "00062840.170000|Export Form Objects       ..."
-        strRecord = Format(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 100)
+        strRecord = Format(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 255)
         ' Add to array.
         varItems(lngCnt) = strRecord
         ' Increment counter for array

From 8c6d7f949e1a23e51b6d22073bd917659e4167d4 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 19 Oct 2023 15:18:28 -0500
Subject: [PATCH 09/73] Resolve conflict with upstream file

Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard.
---
 .../modules/clsPerformance.cls                    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index 17fd8bdf..aae14f60 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -96,6 +96,7 @@ Public Property Get CallStack() As String
 
 End Property
 
+
 '---------------------------------------------------------------------------------------
 ' Procedure : CurrentCategoryName
 ' Author    : hecon5
@@ -515,10 +516,10 @@ End Function
 '           : e                12     3.23
 '---------------------------------------------------------------------------------------
 '
-Private Function ListResult(strHeading As String _
-                            , strResult1 As String _
-                            , strResult2 As String _
-                            , lngCol() As Long) As String
+Private Function ListResult(strHeading As String, _
+                            strResult1 As String, _
+                            strResult2 As String, _
+                            lngCol() As Long) As String
 
     Dim strRowHeading As String
     Dim lngPos As Long
@@ -560,9 +561,9 @@ End Function
 ' Purpose   : Pads a string
 '---------------------------------------------------------------------------------------
 '
-Private Function PadRight(strText As String _
-                        , lngLen As Long _ 
-                        , Optional lngMinTrailingSpaces As Long = 1) As String
+Private Function PadRight(strText As String, _
+                        lngLen As Long, _
+                        Optional lngMinTrailingSpaces As Long = 1) As String
 
     Dim strResult As String
     Dim strTrimmed As String

From 6cdac0c2824675ede287b22caf1561907dc0ebea Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:20:29 -0500
Subject: [PATCH 10/73] Add option to pass path to build API

You can now specify the source files path when you initiate a build through the API. This allows automated builds to be run even if a copy of the database does not yet exist. (Such as after checking out a project in an automated CI workflow.) #430
---
 Version Control.accda.src/dbs-properties.json |  2 +-
 .../forms/frmVCSMain.bas                      | 72 +++++++++++++------
 .../modules/clsVersionControl.cls             |  4 +-
 Version Control.accda.src/modules/modAPI.bas  | 15 ++--
 4 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index 0f394126..a4853bdb 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.24",
+      "Value": "4.0.25",
       "Type": 10
     },
     "Auto Compact": {
diff --git a/Version Control.accda.src/forms/frmVCSMain.bas b/Version Control.accda.src/forms/frmVCSMain.bas
index 1f90d7b8..08f52751 100644
--- a/Version Control.accda.src/forms/frmVCSMain.bas	
+++ b/Version Control.accda.src/forms/frmVCSMain.bas	
@@ -16,10 +16,10 @@ Begin Form
     Width =9360
     DatasheetFontHeight =11
     ItemSuffix =33
-    Left =3225
-    Top =2430
-    Right =18945
-    Bottom =14175
+    Left =20761
+    Top =2250
+    Right =-29055
+    Bottom =13995
     OnUnload ="[Event Procedure]"
     RecSrcDt = Begin
         0x79e78b777268e540
@@ -1749,6 +1749,9 @@ Public objSingleObject As AccessObject
 ' (The Log object has already been reset at this point, so we can't use Log.LogFilePath.)
 Public strLastLogFilePath As String
 
+' Use this property to set the path to the source files (such as a build triggered from the API)
+Public strSourcePath As String
+
 
 '---------------------------------------------------------------------------------------
 ' Procedure : cmdBuild_Click
@@ -1760,11 +1763,6 @@ Public strLastLogFilePath As String
 Public Sub cmdBuild_Click()
 
     Dim strFolder As String
-    Dim strMsg(0 To 2) As String
-    Dim intChoice As VbMsgBoxResult
-
-    DoCmd.Hourglass True
-    DoEvents
 
     ' Make sure we use the add-in to build the add-in.
     If CodeProject.FullName = CurrentProject.FullName Then
@@ -1774,6 +1772,43 @@ Public Sub cmdBuild_Click()
         Exit Sub
     End If
 
+    ' Get source files folder
+    If Len(Me.strSourcePath) Then
+        ' Use specified build folder
+        strFolder = Me.strSourcePath
+    Else
+        ' Attempt to get the source folder from the current database, or from
+        ' a folder picker dialog.
+        strFolder = GetSourceFolder
+        ' Exit out of build if the user cancelled any of the confirmations.
+        If strFolder = vbNullString Then Exit Sub
+    End If
+
+    ' Build project using the selected source folder
+    ' (Use a timer so we can release the reference to this form before beginning the
+    '  build process, just in case we need to import a form with the same name.)
+    If strFolder <> vbNullString Then SetTimer "Build", strFolder, chkFullBuild
+
+End Sub
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : GetSourceFolder
+' Author    : Adam Waller
+' Date      : 10/19/2023
+' Purpose   : Return the source files folder from either the currently open database
+'           : or from a folder picker dialog. (Returns an empty string if the user
+'           : cancels the selection.)
+'---------------------------------------------------------------------------------------
+'
+Private Function GetSourceFolder() As String
+
+    Dim strMsg(0 To 2) As String
+    Dim intChoice As VbMsgBoxResult
+
+    DoCmd.Hourglass True
+    DoEvents
+
     ' Close the current database if it is currently open.
     If DatabaseFileOpen Then
         If FolderHasVcsOptionsFile(Options.GetExportFolder) Then
@@ -1795,18 +1830,18 @@ Public Sub cmdBuild_Click()
             End If
             If intChoice = vbYes Then
                 ' Rebuild the open project
-                strFolder = Options.GetExportFolder
+                GetSourceFolder = Options.GetExportFolder
             ElseIf intChoice = vbCancel Then
                 ' Canceled out of build option.
                 DoCmd.Hourglass False
-                Exit Sub
+                Exit Function
             End If
         End If
     End If
 
     ' If we aren't doing the current database, then prompt user to find a folder
     ' with source files to use for the build.
-    If strFolder = vbNullString Then
+    If GetSourceFolder = vbNullString Then
 
         ' Show a folder picker to select the file with source code.
         DoCmd.Hourglass False
@@ -1820,26 +1855,21 @@ Public Sub cmdBuild_Click()
                 ' Selected a folder
                 If FolderHasVcsOptionsFile(.SelectedItems(1)) Then
                     ' Has source files
-                    strFolder = .SelectedItems(1) & PathSep
+                    GetSourceFolder = .SelectedItems(1) & PathSep
                     DoCmd.Hourglass True
                 Else
                     MsgBox2 "Source files not found", "Required source files were not found in this folder.", _
                         "You selected: " & .SelectedItems(1), vbExclamation
-                    Exit Sub
+                    Exit Function
                 End If
             Else
                 ' Canceled dialog
-                Exit Sub
+                Exit Function
             End If
         End With
     End If
 
-    ' Build project using the selected source folder
-    ' (Use a timer so we can release the reference to this form before beginning the
-    '  build process, just in case we need to import a form with the same name.)
-    If strFolder <> vbNullString Then SetTimer "Build", strFolder, chkFullBuild
-
-End Sub
+End Function
 
 
 '---------------------------------------------------------------------------------------
diff --git a/Version Control.accda.src/modules/clsVersionControl.cls b/Version Control.accda.src/modules/clsVersionControl.cls
index e3c32285..35c22c47 100644
--- a/Version Control.accda.src/modules/clsVersionControl.cls	
+++ b/Version Control.accda.src/modules/clsVersionControl.cls	
@@ -118,11 +118,12 @@ End Sub
 ' Purpose   : Initiate a full build from source
 '---------------------------------------------------------------------------------------
 '
-Public Sub Build()
+Public Sub Build(Optional strSourceFolder As String)
     DoCmd.OpenForm "frmVCSMain", , , , , acHidden
     With Form_frmVCSMain
         ' Make sure we are doing a full build.
         If Not .chkFullBuild Then .chkFullBuild = True
+        .strSourcePath = strSourceFolder
         .cmdBuild_Click
     End With
 End Sub
@@ -426,6 +427,7 @@ Public Sub ActivateHook()
     End If
 End Sub
 
+
 '---------------------------------------------------------------------------------------
 ' Procedure : Class_Initialize
 ' Author    : Adam Waller
diff --git a/Version Control.accda.src/modules/modAPI.bas b/Version Control.accda.src/modules/modAPI.bas
index 99daca10..e83c3c34 100644
--- a/Version Control.accda.src/modules/modAPI.bas	
+++ b/Version Control.accda.src/modules/modAPI.bas	
@@ -44,7 +44,7 @@ End Enum
 '           :  Access add-in.)
 '---------------------------------------------------------------------------------------
 '
-Public Function HandleRibbonCommand(strCommand As String) As Boolean
+Public Function HandleRibbonCommand(strCommand As String, Optional strArgument As String) As Boolean
     ' The function is called by Application.Run which can be re-entrant but we really
     ' don't want it to be since that'd cause errors. To avoid this, we will ignore any
     ' commands while the current command is running.
@@ -62,17 +62,21 @@ Public Function HandleRibbonCommand(strCommand As String) As Boolean
     ' Make sure we are not attempting to run this from the current database when making
     ' changes to the add-in itself. (It will re-run the command through the add-in.)
     If RunningOnLocal() Then
-        RunInAddIn "HandleRibbonCommand", True, strCommand
+        RunInAddIn "HandleRibbonCommand", True, strCommand, strArgument
         GoTo CleanUp
     End If
 
     ' If a function is not found, this will throw an error. It is up to the ribbon
     ' designer to ensure that the control IDs match public procedures in the VCS
-    ' (clsVersionControl) class module. Additional parameters are not supported.
+    ' (clsVersionControl) class module.
     ' For example, to run VCS.Export, the ribbon button ID should be named "btnExport"
 
     ' Trim off control ID prefix when calling command
-    CallByName VCS, Mid(strCommand, 4), VbMethod
+    If Len(strArgument) Then
+        CallByName VCS, Mid(strCommand, 4), VbMethod, strArgument
+    Else
+        CallByName VCS, Mid(strCommand, 4), VbMethod
+    End If
 
 CleanUp:
     IsRunning = False
@@ -310,7 +314,8 @@ Public Function ExampleBuildFromSource()
         ' Set the application interaction level to silent to skip confirmation dialogs.
         Application.Run "MSAccessVCS.SetInteractionMode", 1
         ' Launch the build process (as if we clicked the button on the ribbon)
-        Application.Run "MSAccessVCS.HandleRibbonCommand", "btnBuild"
+        ' Optionally specify a specific folder of source files to build from.
+        Application.Run "MSAccessVCS.HandleRibbonCommand", "btnBuild" ', "c:\path\to\source\folder"
     End If
 
 End Function

From 734d83524038d6b71c3e8a263c58fd87c4180ee1 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Thu, 19 Oct 2023 18:12:02 -0500
Subject: [PATCH 11/73] The logic for checking of existence of git files wasn't
 always working as expected due to searching the current directory rather than
 using the export folder.

---
 Version Control.accda.src/modules/modVCSUtility.bas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 40c424b9..b15f3b4d 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -794,7 +794,7 @@ Public Sub CheckGitFiles()
     Dim strFile As String
     Dim blnAdded As Boolean
 
-    strPath = CurrentProject.Path & PathSep
+    strPath = Options.GetExportFolder
     If FSO.FolderExists(strPath & ".git") Then
 
         ' gitignore file

From 4703b7bac13a6799e7f4221cfdbbdfc1e6303a67 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Thu, 19 Oct 2023 18:17:33 -0500
Subject: [PATCH 12/73] Add a check when loading XML and verify it was
 successfully parsed. This avoid generating a bad export where the data are
 not actually exported due to invalid XML being generated by
 Application.ExportXML. Unfortunately, if a table contains any characters that
 aren't valid for XML document, it won't try to escape them and include them
 as literals. Even if they were escaped, they might not be accepted anyway.
 XML specifications forbids having any characters in 0x01-0x31 range so if a
 table data contains such characters, this can cause the XML export to fail.
 In this case, tab delimited will have to be used instead. However, the
 previous version was simply silently exporting as if everything is hunky-dory
 when it's not. Hence, the error.

---
 Version Control.accda.src/modules/modSanitize.bas | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/modSanitize.bas
index 2e284b39..c84f2a70 100644
--- a/Version Control.accda.src/modules/modSanitize.bas	
+++ b/Version Control.accda.src/modules/modSanitize.bas	
@@ -618,7 +618,11 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
         Set objXml = New MSXML2.DOMDocument60
     End If
 
-    objXml.LoadXML strFile
+    If objXml.LoadXML(strFile) = False Then
+        Log.Error eelError, _
+                "Unable to parse the XML for file '" & strPath & "'. This may be due to containing malformed XML. Check the source XML document for validity. In some cases, this may be due to table data containing characters not allowed in XML documents.", ModuleName & ".SanitizeXML"
+        Exit Function
+    End If
 
     ' Determine if it's a table data with schema
     For Each objNode In objXml.SelectNodes("/root/dataroot")

From 0d9ac0a74c1e0815a90931cec21c7b469e3b8965 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Thu, 19 Oct 2023 18:19:17 -0500
Subject: [PATCH 13/73] The export log was littered with bunch of warnings
 about unclosed blocks. This seems to be due to not closing it when evaluating
 the UseTheme. Even if we skipped it, we still need to remove it from
 m_colBlocks to balance everything out.

---
 Version Control.accda.src/modules/modSanitize.bas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/modSanitize.bas
index c84f2a70..5eb760be 100644
--- a/Version Control.accda.src/modules/modSanitize.bas	
+++ b/Version Control.accda.src/modules/modSanitize.bas	
@@ -394,8 +394,12 @@ Private Sub CloseBlock()
 
     ' Skip if we are not using themes for this control (UseTheme=0)
     ' (Applies to "CommandButton", "Tab", "ToggleButton")
-    If dBlock.Exists("UseTheme") Then Exit Sub
-
+    If dBlock.Exists("UseTheme") Then 
+		' Remove this block
+        m_colBlocks.Remove m_colBlocks.Count
+		Exit Sub
+	End If
+	
     ' Build array of base properties
     varBase = Array("Back", "AlternateBack", "Border", _
             "Fore", "Gridline", "HoverFore", _

From 736c33c7066d783fbf7fe95778567800f3dfb611 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Fri, 20 Oct 2023 11:45:31 -0500
Subject: [PATCH 14/73] Fix a subscript out of range error where the tokens
 advance beyond the end of the string but the function GetNextTokenID returns
 0, which then fails within FormatSQL function since there is no member at
 index 0. It's not clear why this only fails every second time a query is
 exported but it is the case where if it fails, exporting it next time will
 not yield the error. Do it 3rd time, then it fails.

---
 Version Control.accda.src/modules/clsSqlFormatter.cls | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index 423794b8..bdbe7866 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -82,7 +82,7 @@ Private m_varWordCache(1 To 2) As Variant
 
 
 '---------------------------------------------------------------------------------------
-' Procedure : Format
+' Procedure : FormatSQL
 ' Author    : Adam Waller
 ' Date      : 4/1/2020
 ' Purpose   : This is the main function used outside the class for SQL formatting.
@@ -1214,6 +1214,12 @@ End Function
 '
 Private Function GetNextTokenID(lngCurrentToken As Long, Optional intExceptType As eTokenTypes) As Long
     Dim intToken As Integer
+
+    If lngCurrentToken + 1 > m_colTokens.Count Then
+        GetNextTokenID = lngCurrentToken + 1
+        Exit Function
+    End If
+
     For intToken = lngCurrentToken + 1 To m_colTokens.Count
         If m_colTokens(intToken)(0) <> intExceptType Then
             GetNextTokenID = intToken

From 5b5e03755014cc7b45160130413e680cbf8303c4 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Fri, 20 Oct 2023 11:46:05 -0500
Subject: [PATCH 15/73] Add more types of queries that should not be formatted
 by SQL formatter because they are a variant of pass-through queries.

---
 .../modules/clsDbQuery.cls                      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbQuery.cls b/Version Control.accda.src/modules/clsDbQuery.cls
index c09e1aa4..cd7d08df 100644
--- a/Version Control.accda.src/modules/clsDbQuery.cls	
+++ b/Version Control.accda.src/modules/clsDbQuery.cls	
@@ -62,12 +62,17 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
             On Error GoTo 0
             If strSql <> vbNullString Then
                 ' Pass-through queries should not be formatted, since they support formatting and comments.
-                If Options.SaveQuerySQL And dbs.QueryDefs(m_Query.Name).Type <> dbQSQLPassThrough Then
-                    With New clsSqlFormatter
-                        Perf.OperationStart "Format SQL"
-                        WriteFile .FormatSQL(strSql), strFile
-                        Perf.OperationEnd
-                    End With
+                If Options.SaveQuerySQL Then
+                    Select Case dbs.QueryDefs(m_Query.Name).Type
+                        Case dbQSQLPassThrough, dbQSPTBulk, dbQSetOperation
+                            'Do not format
+                        Case Else
+                            With New clsSqlFormatter
+                                Perf.OperationStart "Format SQL"
+                                WriteFile .FormatSQL(strSql), strFile
+                                Perf.OperationEnd
+                            End With
+                    End Select
                 Else
                     WriteFile strSql, strFile
                 End If

From 490d82eaea90d91fedb394460be92187ed88bcb6 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Fri, 20 Oct 2023 11:47:41 -0500
Subject: [PATCH 16/73] The AutoClose may run after the form has closed (e.g.
 if the user is quick to close it) which may result in an error about object
 members not available. Since the form is closed, there's no point in setting
 the timer interval. To avoid the error when debugging, we add a IsLoaded
 check and skip it if it's not loaded.

---
 Version Control.accda.src/forms/frmVCSMain.bas | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/forms/frmVCSMain.bas b/Version Control.accda.src/forms/frmVCSMain.bas
index 08f52751..de354f4c 100644
--- a/Version Control.accda.src/forms/frmVCSMain.bas	
+++ b/Version Control.accda.src/forms/frmVCSMain.bas	
@@ -2138,7 +2138,13 @@ End Sub
 '---------------------------------------------------------------------------------------
 '
 Public Sub AutoClose()
-    Me.TimerInterval = 2000
+    'The procedure may be called when the form has been closed.
+    'In this case, a VBA error may occur, so we check if the
+    'form is loaded before setting the property. We do not use
+    'the Me.Name because that would be also an error.
+    If IsLoaded(acForm, "frmVCSMain", False) Then
+        Me.TimerInterval = 2000
+    End If
 End Sub
 
 

From a666c9dbe161d00580c517874955222b1f86e142 Mon Sep 17 00:00:00 2001
From: hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:33:38 -0400
Subject: [PATCH 17/73] Fix issue with LogUnhandledErrors and simplify use.
 (#449)

---
 .../modules/modErrorHandling.bas              | 59 ++++++++++++++-----
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/Version Control.accda.src/modules/modErrorHandling.bas b/Version Control.accda.src/modules/modErrorHandling.bas
index 78bb4272..0cbf3713 100644
--- a/Version Control.accda.src/modules/modErrorHandling.bas	
+++ b/Version Control.accda.src/modules/modErrorHandling.bas	
@@ -9,6 +9,7 @@ Option Compare Database
 Option Private Module
 Option Explicit
 
+Private Const ModuleName As String = "modErrorHandling"
 
 Private Type udtThis
     blnInError As Boolean   ' Monitor error state
@@ -41,20 +42,22 @@ End Function
 ' Purpose   : Log any unhandled error condition, also breaking code execution if that
 '           : option is currently set. (Run this before any ON ERROR directive which
 '           : will siently reset any current VBA error condition.)
+'
+' Example   : See Sub `CatchTest` for example use.
+'
 '---------------------------------------------------------------------------------------
 '
-Public Sub LogUnhandledErrors()
-
-    Dim blnBreak As Boolean
+Public Sub LogUnhandledErrors(Optional ByRef CallingFunction As String = vbNullString)
 
     ' Check for any unhandled errors
     If (Err.Number <> 0) And Not this.blnInError Then
 
-        ' Don't reference the property this till we have loaded the options.
-        If OptionsLoaded Then blnBreak = Options.BreakOnError
+        this.blnInError = True ' Set flag so we don't create a loop while logging the error
 
+        ' With the above flag, options will load in background and we don't depend on
+        ' flags outside of this routine.
         ' Check current BreakOnError mode
-        If blnBreak Then
+        If Options.BreakOnError Then
             ' Stop the code here so we can investigate the source of the error.
             Debug.Print "Error " & Err.Number & ": " & Err.Description
             Stop
@@ -81,20 +84,48 @@ Public Sub LogUnhandledErrors()
             '===========================================================================
         Else
             ' Log otherwise unhandled error
-            If Not Log(False) Is Nothing Then
-                ' Set flag so we don't create a loop while logging the error
-                this.blnInError = True
-                ' We don't know the procedure that it originated from, but we should at least
-                ' log that the error occurred. A review of the log file may help identify the source.
-                Log.Error eelError, "Unhandled error, likely before `On Error` directive", "Unknown"
-                this.blnInError = False
-            End If
+            ' We don't know the procedure that it originated from, but we should at least
+            ' log that the error occurred. A review of the log file may help identify the source.
+            Log.Error eelError, "Unhandled error, likely before `On Error` directive", CallingFunction & ".Unknown.LogUnhandledErrors"
         End If
+        this.blnInError = False
     End If
 
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : CatchTest
+' Author    : hecon5
+' Date      : 10/20/2023
+' Purpose   : Validates that Catch operates correctly and that LogUnhandledErrors
+'           : doesn't create an infinite loop whether or not log exists.
+'           :
+'           : To use, run normally, after loading options / other core dependancies.
+'           : Then Stop the code (in VBA IDE) and then run again. Stopping code execution
+'           :
+'---------------------------------------------------------------------------------------
+'
+Public Sub CatchTest()
+
+    ' Specifiying a Const FunctionName allows copy/paste code and having the wrong FunctionName
+    ' names if (when) they change.
+    Const FunctionName As String = ModuleName & ".CatchTest"
+
+    On Error Resume Next ' Clear out any errors that may happen, and continue on when errors happen.
+    Err.Raise 24601, "Pre Log Test"
+
+    ' This is the "standard" way of catching errors without losing them.
+    LogUnhandledErrors FunctionName
+    On Error Resume Next
+
+    ' "Pretend" code tossing an error.
+    Err.Raise 24602, "Post Log Test"
+    ' Checking for any issues post code execution.
+    CatchAny eelError, "Catch Test Validation", FunctionName
+
+End Sub
+
 '---------------------------------------------------------------------------------------
 ' Procedure : Catch
 ' Author    : Adam Waller

From 40cffbc61e31b1cf8ec2e34dffb0aa143e8ddf83 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 24 Oct 2023 13:49:52 -0500
Subject: [PATCH 18/73] Add option to SplitLayoutFromVBA

This option (on by default) will save the VBA code from forms and reports as a related .cls file. (Still under development.) #378

Also removed the "Strip out Publish Option" from the options form. I have never heard of a case where this needs to be changed, and it frees up space for the new option we are adding without cluttering the form.
---
 .../forms/frmVCSOptions.bas                   | 126 +++++++++---------
 .../modules/clsOptions.cls                    |   3 +
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSOptions.bas b/Version Control.accda.src/forms/frmVCSOptions.bas
index d9bf3360..df1e3ac2 100644
--- a/Version Control.accda.src/forms/frmVCSOptions.bas	
+++ b/Version Control.accda.src/forms/frmVCSOptions.bas	
@@ -15,11 +15,11 @@ Begin Form
     GridY =24
     Width =10080
     DatasheetFontHeight =11
-    ItemSuffix =250
-    Left =-25575
-    Top =1500
-    Right =-5310
-    Bottom =14085
+    ItemSuffix =252
+    Left =3225
+    Top =2430
+    Right =13890
+    Bottom =14175
     RecSrcDt = Begin
         0x79e78b777268e540
     End
@@ -794,8 +794,8 @@ Begin Form
                                     OverlapFlags =247
                                     Left =1020
                                     Top =3360
-                                    TabIndex =2
-                                    Name ="chkStripPublishOption"
+                                    TabIndex =4
+                                    Name ="chkExtractThemeFiles"
 
                                     LayoutCachedLeft =1020
                                     LayoutCachedTop =3360
@@ -806,14 +806,14 @@ Begin Form
                                             OverlapFlags =247
                                             Left =1320
                                             Top =3300
-                                            Width =2640
+                                            Width =2340
                                             Height =315
                                             ForeColor =5324600
-                                            Name ="Label34"
-                                            Caption ="Strip out Publish Option"
+                                            Name ="Label112"
+                                            Caption ="Extract Theme Files"
                                             LayoutCachedLeft =1320
                                             LayoutCachedTop =3300
-                                            LayoutCachedWidth =3960
+                                            LayoutCachedWidth =3660
                                             LayoutCachedHeight =3615
                                             ForeThemeColorIndex =-1
                                             ForeTint =100.0
@@ -830,7 +830,7 @@ Begin Form
                                     Top =3720
                                     Width =1980
                                     Height =315
-                                    TabIndex =3
+                                    TabIndex =2
                                     Name ="cboSanitizeLevel"
                                     RowSourceType ="Value List"
                                     ColumnWidths ="0"
@@ -868,7 +868,7 @@ Begin Form
                                     Top =4140
                                     Width =1980
                                     Height =315
-                                    TabIndex =4
+                                    TabIndex =3
                                     Name ="cboSanitizeColors"
                                     RowSourceType ="Value List"
                                     ColumnWidths ="0"
@@ -990,9 +990,39 @@ Begin Form
                                 Begin CheckBox
                                     OverlapFlags =247
                                     Left =5340
-                                    Top =4620
+                                    Top =4200
                                     TabIndex =8
-                                    Name ="chkExtractThemeFiles"
+                                    Name ="chkFormatSQL"
+
+                                    LayoutCachedLeft =5340
+                                    LayoutCachedTop =4200
+                                    LayoutCachedWidth =5600
+                                    LayoutCachedHeight =4440
+                                    Begin
+                                        Begin Label
+                                            OverlapFlags =247
+                                            Left =5640
+                                            Top =4140
+                                            Width =2340
+                                            Height =315
+                                            ForeColor =5324600
+                                            Name ="Label249"
+                                            Caption ="Format SQL"
+                                            LayoutCachedLeft =5640
+                                            LayoutCachedTop =4140
+                                            LayoutCachedWidth =7980
+                                            LayoutCachedHeight =4455
+                                            ForeThemeColorIndex =-1
+                                            ForeTint =100.0
+                                        End
+                                    End
+                                End
+                                Begin CheckBox
+                                    OverlapFlags =247
+                                    Left =5340
+                                    Top =4620
+                                    TabIndex =9
+                                    Name ="chkSplitLayoutFromVBA"
 
                                     LayoutCachedLeft =5340
                                     LayoutCachedTop =4620
@@ -1006,8 +1036,8 @@ Begin Form
                                             Width =2340
                                             Height =315
                                             ForeColor =5324600
-                                            Name ="Label112"
-                                            Caption ="Extract Theme Files"
+                                            Name ="Label251"
+                                            Caption ="Split Layout from VBA"
                                             LayoutCachedLeft =5640
                                             LayoutCachedTop =4560
                                             LayoutCachedWidth =7980
@@ -1024,7 +1054,7 @@ Begin Form
                                     Top =5100
                                     Width =2700
                                     Height =315
-                                    TabIndex =9
+                                    TabIndex =10
                                     Name ="txtRunBeforeExport"
 
                                     LayoutCachedLeft =3540
@@ -1057,7 +1087,7 @@ Begin Form
                                     Top =5520
                                     Width =2700
                                     Height =315
-                                    TabIndex =10
+                                    TabIndex =11
                                     Name ="txtRunAfterExport"
 
                                     LayoutCachedLeft =3540
@@ -1089,7 +1119,7 @@ Begin Form
                                     Left =7140
                                     Top =5640
                                     Width =2160
-                                    TabIndex =11
+                                    TabIndex =12
                                     Name ="cmdExplainOptions"
                                     Caption ="Explain options..."
                                     HyperlinkAddress ="https://github.com/joyfullservice/msaccess-vcs-addin/wiki/Documentation#options"
@@ -1153,20 +1183,6 @@ Begin Form
                                     PressedThemeColorIndex =-1
                                     PressedShade =100.0
                                 End
-                                Begin Label
-                                    OverlapFlags =247
-                                    Left =6120
-                                    Top =2400
-                                    Width =2160
-                                    Height =240
-                                    FontSize =10
-                                    Name ="Label46"
-                                    Caption ="(Blank for default)"
-                                    LayoutCachedLeft =6120
-                                    LayoutCachedTop =2400
-                                    LayoutCachedWidth =8280
-                                    LayoutCachedHeight =2640
-                                End
                                 Begin CommandButton
                                     FontUnderline = NotDefault
                                     TabStop = NotDefault
@@ -1176,7 +1192,7 @@ Begin Form
                                     Width =1140
                                     Height =240
                                     FontSize =10
-                                    TabIndex =12
+                                    TabIndex =13
                                     Name ="cmdPrintSettingsOptions"
                                     Caption ="Options..."
                                     OnClick ="[Event Procedure]"
@@ -1212,35 +1228,19 @@ Begin Form
                                     PressedForeThemeColorIndex =10
                                     PressedForeTint =100.0
                                 End
-                                Begin CheckBox
+                                Begin Label
                                     OverlapFlags =247
-                                    Left =5340
-                                    Top =4200
-                                    TabIndex =13
-                                    Name ="chkFormatSQL"
-
-                                    LayoutCachedLeft =5340
-                                    LayoutCachedTop =4200
-                                    LayoutCachedWidth =5600
-                                    LayoutCachedHeight =4440
-                                    Begin
-                                        Begin Label
-                                            OverlapFlags =247
-                                            Left =5640
-                                            Top =4140
-                                            Width =2340
-                                            Height =315
-                                            ForeColor =5324600
-                                            Name ="Label249"
-                                            Caption ="Format SQL"
-                                            LayoutCachedLeft =5640
-                                            LayoutCachedTop =4140
-                                            LayoutCachedWidth =7980
-                                            LayoutCachedHeight =4455
-                                            ForeThemeColorIndex =-1
-                                            ForeTint =100.0
-                                        End
-                                    End
+                                    Left =6120
+                                    Top =2400
+                                    Width =2160
+                                    Height =240
+                                    FontSize =10
+                                    Name ="Label46"
+                                    Caption ="(Blank for default)"
+                                    LayoutCachedLeft =6120
+                                    LayoutCachedTop =2400
+                                    LayoutCachedWidth =8280
+                                    LayoutCachedHeight =2640
                                 End
                             End
                         End
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index adb97d98..4f091b0b 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -32,6 +32,7 @@ Public SaveQuerySQL As Boolean
 Public FormatSQL As Boolean
 Public ForceImportOriginalQuerySQL As Boolean
 Public SaveTableSQL As Boolean
+Public SplitLayoutFromVBA As Boolean
 Public StripPublishOption As Boolean
 Public SanitizeColors As eSanitizeLevel
 Public SanitizeLevel As eSanitizeLevel
@@ -78,6 +79,7 @@ Public Sub LoadDefaults()
         .FormatSQL = True
         .ForceImportOriginalQuerySQL = False
         .SaveTableSQL = True
+        .SplitLayoutFromVBA = True
         .StripPublishOption = True
         .SanitizeLevel = eslStandard
         .SanitizeColors = eslMinimal
@@ -568,6 +570,7 @@ Private Sub Class_Initialize()
         .Add "FormatSQL"
         .Add "ForceImportOriginalQuerySQL"
         .Add "SaveTableSQL"
+        .Add "SplitLayoutFromVBA"
         .Add "StripPublishOption"
         .Add "SanitizeColors"
         .Add "SanitizeLevel"

From 07e364e01dc9cc63450f41de4b322a6a8e6dad4f Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:16:53 -0500
Subject: [PATCH 19/73] Refactor code module export to shared function

This logic will be shared when exporting code modules from forms and reports.
---
 .../modules/clsDbModule.cls                   | 24 ++-------------
 .../modules/modVCSUtility.bas                 | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbModule.cls b/Version Control.accda.src/modules/clsDbModule.cls
index 147db934..79c13336 100644
--- a/Version Control.accda.src/modules/clsDbModule.cls	
+++ b/Version Control.accda.src/modules/clsDbModule.cls	
@@ -42,17 +42,11 @@ Implements IDbComponent
 '
 Private Sub IDbComponent_Export(Optional strAlternatePath As String)
 
-    Dim strTempFile As String
-    Dim strContent As String
     Dim strExt As String
     Dim strAlternateFile As String
 
-    ' Export to temp file and convert to UTF-8 encoding
-    strTempFile = GetTempFile
-    ExportVbComponent strTempFile
-    strContent = SanitizeVBA(ReadFile(strTempFile, GetSystemEncoding))
-    WriteFile strContent, Nz2(strAlternatePath, IDbComponent_SourceFile)
-    DeleteFile strTempFile
+    ' Export as sanitized UTF-8 file
+    ExportCodeModule m_Module.Name, Nz2(strAlternatePath, IDbComponent_SourceFile)
 
     ' Remove any file with the same name but alternate extension
     strExt = IIf(GetExtension = ".bas", ".cls", ".bas")
@@ -243,20 +237,6 @@ Private Sub IDbComponent_Merge(strFile As String)
 End Sub
 
 
-'---------------------------------------------------------------------------------------
-' Procedure : ExportVbComponent
-' Author    : Adam Waller
-' Date      : 5/26/2021
-' Purpose   : Export the code module VB component
-'---------------------------------------------------------------------------------------
-'
-Private Sub ExportVbComponent(strFile As String)
-    Perf.OperationStart "Export VBE Module"
-    CurrentVBProject.VBComponents(m_Module.Name).Export strFile
-    Perf.OperationEnd
-End Sub
-
-
 '---------------------------------------------------------------------------------------
 ' Procedure : IDbComponent_MoveSource
 ' Author    : Adam Waller
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index b15f3b4d..de666e55 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -574,6 +574,36 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : ExportVbComponent
+' Author    : Adam Waller
+' Date      : 5/26/2021
+' Purpose   : Export the code module VB component and convert to UTF-8
+'---------------------------------------------------------------------------------------
+'
+Public Sub ExportCodeModule(strName As String, strFile As String)
+
+    Dim strTempFile As String
+    Dim strContent As String
+
+    Perf.OperationStart "Export VBE Module"
+
+    ' Export to a temp file so we can convert to UTF-8 encoding
+    strTempFile = GetTempFile
+    CurrentVBProject.VBComponents(strName).Export strFile
+
+    ' Sanitize the VBA code while reading the temp file
+    strContent = SanitizeVBA(ReadFile(strTempFile, GetSystemEncoding))
+
+    ' Write the content as UTF-8 to the final destination
+    WriteFile strContent, strFile
+    DeleteFile strTempFile
+
+    Perf.OperationEnd
+
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : RemoveNonBuiltInReferences
 ' Author    : Adam Waller

From 0beaee56eae55e54336029cea1051b6f8c3145b7 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 25 Oct 2023 11:53:30 -0500
Subject: [PATCH 20/73] Support "|" in performance log entry names

Refactored parsing the key from the performance item so that we are not dependent upon a unique delimiter. The timing value is always a number, so we can be confident that the first pipe character is the delimiter. The text after that can be anything, including pipe characters. #450
---
 Version Control.accda.src/modules/clsPerformance.cls | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index aae14f60..bf141388 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -622,8 +622,9 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     ' (We are walking backwards through the array to flip the sort to descending)
     Set dSorted = New Dictionary
     For lngCnt = dItems.Count - 1 To 0 Step -1
-        ' Parse key from record
-        varKey = Trim(Split(varItems(lngCnt), "|")(1))
+        ' Parse key from record (text after first pipe character)
+        strRecord = varItems(lngCnt)
+        varKey = Trim(Mid$(strRecord, InStr(1, strRecord, "|") + 1))
         ' Reference performance item class
         Set cItem = dItems(varKey)
         ' Add to dictionary of resorted items

From 1ca6886959f05bac939c5f97c44812e2850562f7 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:08:09 -0500
Subject: [PATCH 21/73] Adjust indenting

(minor change)
---
 Version Control.accda.src/modules/modSanitize.bas | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/modSanitize.bas
index 5eb760be..c13653bb 100644
--- a/Version Control.accda.src/modules/modSanitize.bas	
+++ b/Version Control.accda.src/modules/modSanitize.bas	
@@ -394,12 +394,12 @@ Private Sub CloseBlock()
 
     ' Skip if we are not using themes for this control (UseTheme=0)
     ' (Applies to "CommandButton", "Tab", "ToggleButton")
-    If dBlock.Exists("UseTheme") Then 
-		' Remove this block
+    If dBlock.Exists("UseTheme") Then
+        ' Remove this block
         m_colBlocks.Remove m_colBlocks.Count
-		Exit Sub
-	End If
-	
+        Exit Sub
+    End If
+
     ' Build array of base properties
     varBase = Array("Back", "AlternateBack", "Border", _
             "Fore", "Gridline", "HoverFore", _

From 8e70ad2323cc2ec5e6397c89f1053701d67da9ac Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:20:38 -0500
Subject: [PATCH 22/73] Convert Sanitize module to class

In some cases sanitizing a source file actually creates two distinct outputs. A layout file and a code file. Rather than making the sanitize function more complicated with byref outputs and non-obvious side effects, I am taking the approach of a more explicit object-oriented route where the code is easier to understand and maintain. (And also allows for future enhancements such as SQL extraction for query definition files.)
---
 .../modules/{modSanitize.bas => clsSanitize.cls}      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 rename Version Control.accda.src/modules/{modSanitize.bas => clsSanitize.cls} (99%)

diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/clsSanitize.cls
similarity index 99%
rename from Version Control.accda.src/modules/modSanitize.bas
rename to Version Control.accda.src/modules/clsSanitize.cls
index c13653bb..4cfb4d1c 100644
--- a/Version Control.accda.src/modules/modSanitize.bas	
+++ b/Version Control.accda.src/modules/clsSanitize.cls	
@@ -1,4 +1,12 @@
-Attribute VB_Name = "modSanitize"
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "clsSanitize"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = False
+Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
 ' Module    : modSanitize
 ' Author    : Adam Waller
@@ -6,7 +14,6 @@
 ' Purpose   : Functions to sanitize files to remove non-essential metadata
 '---------------------------------------------------------------------------------------
 Option Compare Database
-Option Private Module
 Option Explicit
 
 Private Const ModuleName = "modSanitize"

From 1c0d3f4be5298ef46d1e194cc162010c9fc4064e Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:30:30 -0500
Subject: [PATCH 23/73] Refactor sanitizing to use class

Updating the existing code to use the new class.
---
 .../modules/clsDbTableData.cls                |  4 ++-
 .../modules/clsDbTableDef.cls                 |  4 ++-
 .../modules/clsSanitize.cls                   | 25 -------------------
 .../modules/modFunctions.bas                  | 25 +++++++++++++++++++
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbTableData.cls b/Version Control.accda.src/modules/clsDbTableData.cls
index c16c1f8f..480ea475 100644
--- a/Version Control.accda.src/modules/clsDbTableData.cls	
+++ b/Version Control.accda.src/modules/clsDbTableData.cls	
@@ -70,7 +70,9 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
                         Application.ExportXML acExportTable, m_Table.Name, strFile
                     End If
                     Perf.OperationEnd
-                    SanitizeXML strFile, False
+                    With New clsSanitize
+                        .SanitizeXML strFile, False
+                    End With
             End Select
         End If
     Next intFormat
diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls
index cbb183a1..9370b4e2 100644
--- a/Version Control.accda.src/modules/clsDbTableDef.cls	
+++ b/Version Control.accda.src/modules/clsDbTableDef.cls	
@@ -59,7 +59,9 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
         Perf.OperationEnd
 
         ' Rewrite sanitized XML as formatted UTF-8 content
-        strHash = SanitizeXML(strFile, True)
+        With New clsSanitize
+            strHash = .SanitizeXML(strFile, True)
+        End With
 
     Else
         ' Linked table - Save as JSON
diff --git a/Version Control.accda.src/modules/clsSanitize.cls b/Version Control.accda.src/modules/clsSanitize.cls
index 4cfb4d1c..88464b8c 100644
--- a/Version Control.accda.src/modules/clsSanitize.cls	
+++ b/Version Control.accda.src/modules/clsSanitize.cls	
@@ -732,31 +732,6 @@ Public Function TrimTabs(strText As String) As String
 End Function
 
 
-'---------------------------------------------------------------------------------------
-' Procedure : StartsWith
-' Author    : Adam Waller
-' Date      : 11/5/2020
-' Purpose   : See if a string begins with a specified string.
-'---------------------------------------------------------------------------------------
-'
-Public Function StartsWith(strText As String, strStartsWith As String, Optional Compare As VbCompareMethod = vbBinaryCompare) As Boolean
-    StartsWith = (InStr(1, strText, strStartsWith, Compare) = 1)
-End Function
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : EndsWith
-' Author    : Adam Waller
-' Date      : 4/29/2021
-' Purpose   : See if a string ends with a specified string.
-'---------------------------------------------------------------------------------------
-'
-Public Function EndsWith(strText As String, strEndsWith As String, Optional Compare As VbCompareMethod = vbBinaryCompare) As Boolean
-    EndsWith = (StrComp(Right$(strText, Len(strEndsWith)), strEndsWith, Compare) = 0)
-    'EndsWith = (InStr(1, strText, strEndsWith, Compare) = len(strtext len(strendswith) 1)
-End Function
-
-
 '---------------------------------------------------------------------------------------
 ' Procedure : GetIndent
 ' Author    : Adam Waller
diff --git a/Version Control.accda.src/modules/modFunctions.bas b/Version Control.accda.src/modules/modFunctions.bas
index ffb07d17..2f20d2b6 100644
--- a/Version Control.accda.src/modules/modFunctions.bas	
+++ b/Version Control.accda.src/modules/modFunctions.bas	
@@ -877,6 +877,31 @@ Public Function DeDupString(strText As String, strDuplicated As String) As Strin
 End Function
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : StartsWith
+' Author    : Adam Waller
+' Date      : 11/5/2020
+' Purpose   : See if a string begins with a specified string.
+'---------------------------------------------------------------------------------------
+'
+Public Function StartsWith(strText As String, strStartsWith As String, Optional Compare As VbCompareMethod = vbBinaryCompare) As Boolean
+    StartsWith = (InStr(1, strText, strStartsWith, Compare) = 1)
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : EndsWith
+' Author    : Adam Waller
+' Date      : 4/29/2021
+' Purpose   : See if a string ends with a specified string.
+'---------------------------------------------------------------------------------------
+'
+Public Function EndsWith(strText As String, strEndsWith As String, Optional Compare As VbCompareMethod = vbBinaryCompare) As Boolean
+    EndsWith = (StrComp(Right$(strText, Len(strEndsWith)), strEndsWith, Compare) = 0)
+    'EndsWith = (InStr(1, strText, strEndsWith, Compare) = len(strtext len(strendswith) 1)
+End Function
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : SwapExtension
 ' Author    : Adam Waller

From c87261a7de7c5be96a51db0356fefdc26716ee18 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:49:04 -0500
Subject: [PATCH 24/73] Refactor class variables

---
 .../modules/clsSanitize.cls                   | 98 +++++++++++--------
 1 file changed, 58 insertions(+), 40 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSanitize.cls b/Version Control.accda.src/modules/clsSanitize.cls
index 88464b8c..e7d42bc6 100644
--- a/Version Control.accda.src/modules/clsSanitize.cls	
+++ b/Version Control.accda.src/modules/clsSanitize.cls	
@@ -16,12 +16,18 @@ Attribute VB_Exposed = False
 Option Compare Database
 Option Explicit
 
-Private Const ModuleName = "modSanitize"
+Public ObjectName As String
 
-' Array of lines to skip
-Private m_SkipLines() As Long
-Private m_lngSkipIndex As Long
-Private m_colBlocks As Collection
+
+' Private type to handle internal variables
+Private Type udtThis
+    lngSkipLines() As Long  ' Array of lines to skip
+    lngSkipIndex As Long
+    cOutput As clsConcat
+    cVBA As clsConcat
+    colBlocks As Collection
+End Type
+Private this As udtThis
 
 
 '---------------------------------------------------------------------------------------
@@ -77,9 +83,9 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
     If Options.SanitizeLevel = eslNone Then GoTo Build_Output
 
     ' Set up index of lines to skip
-    ReDim m_SkipLines(0 To UBound(varLines)) As Long
-    m_lngSkipIndex = 0
-    Set m_colBlocks = New Collection
+    ReDim this.lngSkipLines(0 To UBound(varLines)) As Long
+    this.lngSkipIndex = 0
+    Set this.colBlocks = New Collection
 
     ' Initialize concatenation class to include line breaks
     ' after each line that we add when building new file text.
@@ -237,11 +243,11 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
     Loop
 
     ' Ensure that we correctly processed the nested block sequence.
-    If m_colBlocks.Count > 0 Then
+    If this.colBlocks.Count > 0 Then
         Log.Error eelWarning, Replace(Replace( _
         "Found ${BlockCount} unclosed blocks after sanitizing ${File}.", _
-        "${BlockCount}", m_colBlocks.Count), _
-        "${File}", strPath), ModuleName & ".SanitizeFile"
+        "${BlockCount}", this.colBlocks.Count), _
+        "${File}", strPath), ModuleName(Me) & ".SanitizeFile"
     End If
 
 Build_Output:
@@ -253,12 +259,12 @@ Build_Output:
     If blnReturnHash Then SanitizeFile = GetStringHash(strContent, True)
 
     ' Log performance
-    Set m_colBlocks = Nothing
+    Set this.colBlocks = Nothing
     Perf.OperationEnd
     Log.Add "    Sanitized in " & Format$(Perf.MicroTimer - curStart, "0.000") & " seconds.", Options.ShowDebug
 
     ' Log any errors
-    CatchAny eelError, "Error sanitizing file " & FSO.GetFileName(strPath), ModuleName & ".SanitizeFile"
+    CatchAny eelError, "Error sanitizing file " & FSO.GetFileName(strPath), ModuleName(Me) & ".SanitizeFile"
 
 End Function
 
@@ -277,14 +283,14 @@ Private Function BuildOutput(varLines As Variant) As String
     Dim lngLine As Long
 
     ' Check index of skipped lines
-    If m_lngSkipIndex = 0 Then
+    If this.lngSkipIndex = 0 Then
         ' No lines to skip
-        ReDim m_SkipLines(0 To 0)
-        m_SkipLines(0) = UBound(varLines) + 1
+        ReDim this.lngSkipLines(0 To 0)
+        this.lngSkipLines(0) = UBound(varLines) + 1
     Else
         ' Trim and sort index array
-        ReDim Preserve m_SkipLines(0 To m_lngSkipIndex - 1)
-        QuickSort m_SkipLines
+        ReDim Preserve this.lngSkipLines(0 To this.lngSkipIndex - 1)
+        QuickSort this.lngSkipLines
     End If
 
     ' Use concatenation class to maximize performance
@@ -297,12 +303,12 @@ Private Function BuildOutput(varLines As Variant) As String
 
             ' Iterate the sorted skipped lines index to keep up with main loop
             ' (Using parallel loops to optimize performance)
-            If m_SkipLines(lngSkip) < lngLine Then
-                If lngSkip < UBound(m_SkipLines) Then lngSkip = lngSkip + 1
+            If this.lngSkipLines(lngSkip) < lngLine Then
+                If lngSkip < UBound(this.lngSkipLines) Then lngSkip = lngSkip + 1
             End If
 
             ' Add content, unless the line is flagged to skip
-            If m_SkipLines(lngSkip) <> lngLine Then .Add CStr(varLines(lngLine))
+            If this.lngSkipLines(lngSkip) <> lngLine Then .Add CStr(varLines(lngLine))
 
         Next lngLine
 
@@ -326,8 +332,8 @@ End Function
 '
 Private Function SkipLine(lngLine As Long, Optional intMinSanitizeLevel As eSanitizeLevel)
     If Options.SanitizeLevel >= intMinSanitizeLevel Then
-        m_SkipLines(m_lngSkipIndex) = lngLine
-        m_lngSkipIndex = m_lngSkipIndex + 1
+        this.lngSkipLines(this.lngSkipIndex) = lngLine
+        this.lngSkipIndex = this.lngSkipIndex + 1
     End If
 End Function
 
@@ -370,10 +376,10 @@ End Function
 '
 Private Sub BeginBlock(Optional strType As String)
     Dim dBlock As Dictionary
-    If m_colBlocks Is Nothing Then Set m_colBlocks = New Collection
+    If this.colBlocks Is Nothing Then Set this.colBlocks = New Collection
     Set dBlock = New Dictionary
     If strType <> vbNullString Then dBlock.Add "Type", strType
-    m_colBlocks.Add dBlock
+    this.colBlocks.Add dBlock
 End Sub
 
 
@@ -396,14 +402,14 @@ Private Sub CloseBlock()
     If Options.SanitizeColors <= eslNone Then Exit Sub
 
     ' Bail out if we don't have a block to review
-    If m_colBlocks.Count = 0 Then Exit Sub
-    Set dBlock = m_colBlocks(m_colBlocks.Count)
+    If this.colBlocks.Count = 0 Then Exit Sub
+    Set dBlock = this.colBlocks(this.colBlocks.Count)
 
     ' Skip if we are not using themes for this control (UseTheme=0)
     ' (Applies to "CommandButton", "Tab", "ToggleButton")
     If dBlock.Exists("UseTheme") Then
         ' Remove this block
-        m_colBlocks.Remove m_colBlocks.Count
+        this.colBlocks.Remove this.colBlocks.Count
         Exit Sub
     End If
 
@@ -448,7 +454,7 @@ Private Sub CloseBlock()
     Next intCnt
 
     ' Remove this block
-    m_colBlocks.Remove m_colBlocks.Count
+    this.colBlocks.Remove this.colBlocks.Count
 
 End Sub
 
@@ -472,9 +478,9 @@ Private Sub CheckColorProperties(strTLine As String, lngLine As Long)
     If Options.SanitizeColors <= eslNone Then Exit Sub
 
     ' Exit if we are not inside a block
-    If Not m_colBlocks Is Nothing Then lngCnt = m_colBlocks.Count
+    If Not this.colBlocks Is Nothing Then lngCnt = this.colBlocks.Count
     If lngCnt = 0 Then Exit Sub
-    Set dBlock = m_colBlocks(m_colBlocks.Count)
+    Set dBlock = this.colBlocks(this.colBlocks.Count)
 
     ' Split on property/value
     varParts = Split(strTLine, " =")
@@ -631,7 +637,7 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
 
     If objXml.LoadXML(strFile) = False Then
         Log.Error eelError, _
-                "Unable to parse the XML for file '" & strPath & "'. This may be due to containing malformed XML. Check the source XML document for validity. In some cases, this may be due to table data containing characters not allowed in XML documents.", ModuleName & ".SanitizeXML"
+                "Unable to parse the XML for file '" & strPath & "'. This may be due to containing malformed XML. Check the source XML document for validity. In some cases, this may be due to table data containing characters not allowed in XML documents.", ModuleName(Me) & ".SanitizeXML"
         Exit Function
     End If
 
@@ -685,7 +691,7 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
     Log.Add "    Sanitized in " & Format$(Perf.MicroTimer - curStart, "0.000") & " seconds.", Options.ShowDebug
 
     ' Log any errors
-    CatchAny eelError, "Error sanitizing XML file " & FSO.GetFileName(strPath), ModuleName & ".SanitizeXML"
+    CatchAny eelError, "Error sanitizing XML file " & FSO.GetFileName(strPath), ModuleName(Me) & ".SanitizeXML"
 
 End Function
 
@@ -697,7 +703,7 @@ End Function
 ' Purpose   : Trim off tabs from beginning and end of string
 '---------------------------------------------------------------------------------------
 '
-Public Function TrimTabs(strText As String) As String
+Private Function TrimTabs(strText As String) As String
 
     Dim dblStart As Double
     Dim dblEnd As Double
@@ -739,7 +745,7 @@ End Function
 ' Purpose   : Returns the number of spaces until the first non-space character.
 '---------------------------------------------------------------------------------------
 '
-Public Function GetIndent(strLine As Variant) As Integer
+Private Function GetIndent(strLine As Variant) As Integer
     Dim strChar As String
     strChar = Left$(Trim(strLine), 1)
     If strLine <> vbNullString Then GetIndent = InStr(1, strLine, strChar) - 1
@@ -753,10 +759,8 @@ End Function
 ' Purpose   : Format XML content for consistent and readable output.
 '---------------------------------------------------------------------------------------
 '
-Private Function FormatXML( _
-    objInput As MSXML2.DOMDocument60, _
-    Optional blnOmitDeclaration As Boolean _
-) As String
+Private Function FormatXML(objInput As MSXML2.DOMDocument60, _
+                            Optional blnOmitDeclaration As Boolean) As String
 
     ' XSLT stylesheet that allow us to control indenting and also get a better indent result.
     ' For testing and adjusting, you can use https://www.online-toolz.com/tools/xslt-validator-tester-online.php
@@ -798,7 +802,7 @@ Private Function FormatXML( _
     End If
 
     ' Check for any errors parsing the XML
-    If CatchAny(eelError, "Error parsing XML content", ModuleName & ".FormatXML") Then
+    If CatchAny(eelError, "Error parsing XML content", ModuleName(Me) & ".FormatXML") Then
         ' Fall back to input XML
         strOutput = objInput.XML
         ' Output XML to log file
@@ -812,3 +816,17 @@ Private Function FormatXML( _
     FormatXML = strOutput
 
 End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : Class_Terminate
+' Author    : Adam Waller
+' Date      : 10/25/2023
+' Purpose   : Release private objects when terminating
+'---------------------------------------------------------------------------------------
+'
+Private Sub Class_Terminate()
+    Set this.colBlocks = Nothing
+    Set this.cOutput = Nothing
+    Set this.cVBA = Nothing
+End Sub

From 89101c5038fa1d90cc0b7a61ff406cddd8e29c02 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:06:49 -0500
Subject: [PATCH 25/73] Refactor form/report export to split VBA

Export is now splitting the VBA from Form and Report objects to separate files with a .cls extension. Moving on to the code that will stitch these files back together before import.
---
 .../modules/clsDbForm.cls                     |   3 +-
 .../modules/clsDbReport.cls                   |   3 +-
 .../modules/clsDbTableData.cls                |   3 +-
 .../modules/clsDbTableDef.cls                 |   5 +-
 .../modules/clsSanitize.cls                   | 294 ++++++++++++++----
 .../modules/modVCSUtility.bas                 |  54 +++-
 6 files changed, 280 insertions(+), 82 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbForm.cls b/Version Control.accda.src/modules/clsDbForm.cls
index b8a27c77..4e54ff3e 100644
--- a/Version Control.accda.src/modules/clsDbForm.cls	
+++ b/Version Control.accda.src/modules/clsDbForm.cls	
@@ -124,6 +124,7 @@ End Sub
 Private Sub IDbComponent_MoveSource(strFromFolder As String, strToFolder As String)
     MoveFileIfExists strFromFolder & FSO.GetFileName(IDbComponent_SourceFile), strToFolder
     MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".json", strToFolder
+    MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".cls", strToFolder
 End Sub
 
 
@@ -180,7 +181,7 @@ End Function
 '
 Private Sub IDbComponent_ClearOrphanedSourceFiles()
     If Not Options.SavePrintVars Then ClearFilesByExtension IDbComponent_BaseFolder, "json"
-    ClearOrphanedSourceFiles Me, "bas", "json"
+    ClearOrphanedSourceFiles Me, "bas", "json", "cls"
 End Sub
 
 
diff --git a/Version Control.accda.src/modules/clsDbReport.cls b/Version Control.accda.src/modules/clsDbReport.cls
index 7ed0b967..203ac99f 100644
--- a/Version Control.accda.src/modules/clsDbReport.cls	
+++ b/Version Control.accda.src/modules/clsDbReport.cls	
@@ -93,6 +93,7 @@ End Sub
 Private Sub IDbComponent_MoveSource(strFromFolder As String, strToFolder As String)
     MoveFileIfExists strFromFolder & FSO.GetFileName(IDbComponent_SourceFile), strToFolder
     MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".json", strToFolder
+    MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".cls", strToFolder
 End Sub
 
 
@@ -150,7 +151,7 @@ End Function
 Private Sub IDbComponent_ClearOrphanedSourceFiles()
     ClearFilesByExtension IDbComponent_BaseFolder, "pv" ' Remove legacy files
     If Not Options.SavePrintVars Then ClearFilesByExtension IDbComponent_BaseFolder, "json"
-    ClearOrphanedSourceFiles Me, "bas", "json"
+    ClearOrphanedSourceFiles Me, "bas", "json", "cls"
 End Sub
 
 
diff --git a/Version Control.accda.src/modules/clsDbTableData.cls b/Version Control.accda.src/modules/clsDbTableData.cls
index 480ea475..4c5fbbbc 100644
--- a/Version Control.accda.src/modules/clsDbTableData.cls	
+++ b/Version Control.accda.src/modules/clsDbTableData.cls	
@@ -71,7 +71,8 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
                     End If
                     Perf.OperationEnd
                     With New clsSanitize
-                        .SanitizeXML strFile, False
+                        .LoadSourceFile strFile
+                        WriteFile .Sanitize(ectXML), strFile
                     End With
             End Select
         End If
diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls
index 9370b4e2..880f850b 100644
--- a/Version Control.accda.src/modules/clsDbTableDef.cls	
+++ b/Version Control.accda.src/modules/clsDbTableDef.cls	
@@ -60,7 +60,10 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
 
         ' Rewrite sanitized XML as formatted UTF-8 content
         With New clsSanitize
-            strHash = .SanitizeXML(strFile, True)
+            .LoadSourceFile strFile
+            DeleteFile strFile
+            WriteFile .Sanitize(ectXML), strFile
+            strHash = .Hash
         End With
 
     Else
diff --git a/Version Control.accda.src/modules/clsSanitize.cls b/Version Control.accda.src/modules/clsSanitize.cls
index e7d42bc6..9b353538 100644
--- a/Version Control.accda.src/modules/clsSanitize.cls	
+++ b/Version Control.accda.src/modules/clsSanitize.cls	
@@ -18,69 +18,210 @@ Option Explicit
 
 Public ObjectName As String
 
+Public Enum eContentType
+    ectObjectDefinition
+    ectXML
+    ectVBA
+End Enum
 
 ' Private type to handle internal variables
 Private Type udtThis
     lngSkipLines() As Long  ' Array of lines to skip
     lngSkipIndex As Long
-    cOutput As clsConcat
-    cVBA As clsConcat
+    strFilePath As String   ' Path to loaded file
+    strInput As String
+    strOutput As String
+    strVBA As String
     colBlocks As Collection
 End Type
 Private this As udtThis
 
 
 '---------------------------------------------------------------------------------------
-' Procedure : SanitizeFile
+' Procedure : LoadFile
 ' Author    : Adam Waller
-' Date      : 11/4/2020
-' Purpose   : Rewritten version of sanitize function. Returns hash of content as well
-'           : as saving to the specified path.
+' Date      : 10/25/2023
+' Purpose   : Load a source file to sanitize
 '---------------------------------------------------------------------------------------
 '
-Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As String
+Public Function LoadSourceFile(strPath As String)
 
-    Dim strFile As String
-    Dim varLines As Variant
-    Dim lngLine As Long
-    Dim strLine As String
-    Dim strTLine As String
-    Dim blnInsideIgnoredBlock As Boolean
-    Dim intIndent As Integer
-    Dim blnIsReport As Boolean
-    Dim blnIsPassThroughQuery As Boolean
-    Dim curStart As Currency
     Dim strTempFile As String
-    Dim strContent As String
 
-    If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next
+    ResetContent
 
     ' Read text from file, and split into lines
     If HasUcs2Bom(strPath) Then
-        strFile = ReadFile(strPath, "Unicode")
+        this.strInput = ReadFile(strPath, "Unicode")
     Else
         ' ADP projects may contain mixed Unicode content
         If CurrentProject.ProjectType = acADP Then
             strTempFile = GetTempFile
             ConvertUcs2Utf8 strPath, strTempFile, False
-            strFile = ReadFile(strTempFile)
+            this.strInput = ReadFile(strTempFile)
             DeleteFile strTempFile
         Else
             If DbVersion <= 4 Then
                 ' Access 2000 format exports using system codepage
                 ' See issue #217
-                strFile = ReadFile(strPath, GetSystemEncoding)
+                this.strInput = ReadFile(strPath, GetSystemEncoding)
             Else
                 ' Newer versions export as UTF-8
-                strFile = ReadFile(strPath)
+                this.strInput = ReadFile(strPath)
             End If
         End If
     End If
 
-    Perf.OperationStart "Sanitize File"
-    varLines = Split(strFile, vbCrLf)
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : LoadString
+' Author    : Adam Waller
+' Date      : 10/27/2023
+' Purpose   : Load input from a string
+'---------------------------------------------------------------------------------------
+'
+Public Function LoadString(ByVal strContent As String)
+    ResetContent
+    this.strInput = strContent
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : ResetContent
+' Author    : Adam Waller
+' Date      : 10/31/2023
+' Purpose   : Resets the local variables when data is loaded from a new source.
+'---------------------------------------------------------------------------------------
+'
+Private Sub ResetContent()
+    With this
+        .strFilePath = vbNullString
+        .strInput = vbNullString
+        .strOutput = vbNullString
+        .strVBA = vbNullString
+    End With
+    Me.ObjectName = vbNullString
+End Sub
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : Sanitize
+' Author    : Adam Waller
+' Date      : 10/25/2023
+' Purpose   : Public wrapper for sanitize functions
+'---------------------------------------------------------------------------------------
+'
+Public Function Sanitize(intContentType As eContentType) As String
+    Select Case intContentType
+        Case ectObjectDefinition:   SanitizeObject
+        Case ectVBA:                SanitizeVBA
+        Case ectXML:                SanitizeXML
+    End Select
+    Sanitize = this.strOutput
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : MergeVBA
+' Author    : Adam Waller
+' Date      : 10/27/2023
+' Purpose   : Merge VBA into the output content.
+'---------------------------------------------------------------------------------------
+'
+Public Sub MergeVBA(strVbaCode As String)
+
+    Dim varLines As Variant
+    Dim lngLine As Long
+
+    ' Rebuild output using provided VBA code
+    With New clsConcat
+        .AppendOnAdd = vbCrLf
+
+        ' Load in existing sanitized content
+        varLines = Split(this.strOutput, vbCrLf)
+        For lngLine = 0 To UBound(varLines)
+            ' Note that the same heading name is used in both forms and reports
+            If varLines(lngLine) = "CodeBehindForm" Then
+                ' Allow merge of empty string to remove VBA code module
+                If Len(strVbaCode) Then .Add CStr(varLines(lngLine))
+                Exit For
+            Else
+                ' Add all other lines
+                .Add CStr(varLines(lngLine))
+            End If
+        Next lngLine
+
+        ' Add the VBA code here, and remove extra vbCrLf
+        .Add strVbaCode
+        .Remove 2
 
-    If Options.SanitizeLevel = eslNone Then GoTo Build_Output
+        ' Update output with combined content
+        this.strOutput = .GetStr
+    End With
+
+End Sub
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : SaveObjectVBA
+' Author    : Adam Waller
+' Date      : 10/31/2023
+' Purpose   : Return the extracted VBA code
+'---------------------------------------------------------------------------------------
+'
+Public Function GetObjectVBA() As String
+    GetObjectVBA = this.strVBA
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : Hash
+' Author    : Adam Waller
+' Date      : 10/25/2023
+' Purpose   : Return a hash of the sanitized content
+'---------------------------------------------------------------------------------------
+'
+Public Function Hash(Optional blnWithBOM As Boolean = True) As String
+    Hash = GetStringHash(this.strOutput, blnWithBOM)
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : SanitizeFile
+' Author    : Adam Waller
+' Date      : 11/4/2020
+' Purpose   : Rewritten version of sanitize function. Returns hash of content as well
+'           : as saving to the specified path.
+'---------------------------------------------------------------------------------------
+'
+Private Function SanitizeObject() As String 'strPath As String, blnReturnHash As Boolean, Optional strObjectName As String) As String
+
+    Dim varLines As Variant
+    Dim lngLine As Long
+    Dim strLine As String
+    Dim strTLine As String
+    Dim blnInsideIgnoredBlock As Boolean
+    Dim intIndent As Integer
+    Dim blnIsReport As Boolean
+    Dim blnIsPassThroughQuery As Boolean
+    Dim curStart As Currency
+    Dim strTempFile As String
+    Dim strContent As String
+    Dim cVBA As clsConcat
+
+    If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next
+
+    ' If not sanitizing, then return output
+    If Options.SanitizeLevel = eslNone Then
+        this.strOutput = this.strInput
+        SanitizeObject = this.strOutput
+        Exit Function
+    End If
+
+    Perf.OperationStart "Sanitize File"
+    varLines = Split(this.strInput, vbCrLf)
 
     ' Set up index of lines to skip
     ReDim this.lngSkipLines(0 To UBound(varLines)) As Long
@@ -177,10 +318,28 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
 
                 ' Code section behind form or report object
                 Case "CodeBehindForm"
-                    ' Apply sanitize rules to VBA code
-                    SanitizeCodeLines lngLine, varLines
-                    ' Keep everything from this point on
-                    Exit Do
+                    If Options.SplitLayoutFromVBA Then
+                        ' Remove the VBA code from the layout file, but add a placeholder
+                        ' comment just in case the user wonders what happened to the VBA
+                        ' source code.
+                        lngLine = lngLine + 1
+                        Set cVBA = New clsConcat
+                        cVBA.AppendOnAdd = vbCrLf
+                        cVBA.Add CStr(varLines(lngLine))
+                        varLines(lngLine) = "' See """ & Nz2(Me.ObjectName, "FileName") & ".cls"""
+                        ' Skip remaining lines
+                        Do While lngLine < UBound(varLines)
+                            lngLine = lngLine + 1
+                            cVBA.Add CStr(varLines(lngLine))
+                            SkipLine lngLine, eslStandard
+                        Loop
+                        Exit Do
+                    Else
+                        ' Apply sanitize rules to VBA code
+                        SanitizeCodeLines lngLine, varLines
+                        ' Keep everything from this point on
+                        Exit Do
+                    End If
 
                 Case Else
                     If blnInsideIgnoredBlock Then
@@ -244,19 +403,25 @@ Public Function SanitizeFile(strPath As String, blnReturnHash As Boolean) As Str
 
     ' Ensure that we correctly processed the nested block sequence.
     If this.colBlocks.Count > 0 Then
-        Log.Error eelWarning, Replace(Replace( _
-        "Found ${BlockCount} unclosed blocks after sanitizing ${File}.", _
-        "${BlockCount}", this.colBlocks.Count), _
-        "${File}", strPath), ModuleName(Me) & ".SanitizeFile"
+        Log.Error eelWarning, MultiReplace( _
+            "Found ${BlockCount} unclosed blocks after sanitizing ${File}.", _
+            "${BlockCount}", this.colBlocks.Count, _
+            "${File}", Nz2(Me.ObjectName, this.strFilePath)), _
+            ModuleName(Me) & ".SanitizeFile"
     End If
 
-Build_Output:
-    ' Build the final output
-    strContent = BuildOutput(varLines)
-    WriteFile strContent, strPath
-
-    ' Return hash of content
-    If blnReturnHash Then SanitizeFile = GetStringHash(strContent, True)
+    ' Prepare primary output
+    this.strOutput = BuildOutput(varLines)
+    SanitizeObject = this.strOutput
+
+    ' Prepare VBA output (if used)
+    If Not cVBA Is Nothing Then
+        ' Build sanitized VBA string
+        With New clsSanitize
+            .LoadString cVBA.GetStr
+            this.strVBA = .Sanitize(ectVBA)
+        End With
+    End If
 
     ' Log performance
     Set this.colBlocks = Nothing
@@ -264,7 +429,7 @@ Build_Output:
     Log.Add "    Sanitized in " & Format$(Perf.MicroTimer - curStart, "0.000") & " seconds.", Options.ShowDebug
 
     ' Log any errors
-    CatchAny eelError, "Error sanitizing file " & FSO.GetFileName(strPath), ModuleName(Me) & ".SanitizeFile"
+    CatchAny eelError, "Error sanitizing " & Nz2(Me.ObjectName, FSO.GetFileName(this.strFilePath)), ModuleName(Me) & ".SanitizeFile"
 
 End Function
 
@@ -541,7 +706,7 @@ End Sub
 '           :   - Remove extra trailing lines from the end of the module.
 '---------------------------------------------------------------------------------------
 '
-Public Function SanitizeVBA(strCode As String) As String
+Private Function SanitizeVBA() As String
 
     Dim lngLine As Long
     Dim varLines As Variant
@@ -549,14 +714,14 @@ Public Function SanitizeVBA(strCode As String) As String
 
     ' Skip sanitizing if not using that option.
     If Options.SanitizeLevel < eslStandard Then
-        SanitizeVBA = strCode
+        SanitizeVBA = this.strInput
         Exit Function
     End If
 
     Perf.OperationStart "Sanitize VBA Code"
 
     ' Split code into lines
-    varLines = Split(strCode, vbCrLf)
+    varLines = Split(this.strInput, vbCrLf)
 
     ' Build sanitized content
     With New clsConcat
@@ -576,7 +741,9 @@ Public Function SanitizeVBA(strCode As String) As String
         Next lngLine
 
         ' Return standardized code block
-        SanitizeVBA = .GetStr
+        this.strOutput = .GetStr
+        this.strVBA = this.strOutput
+        SanitizeVBA = this.strOutput
         Perf.OperationEnd
     End With
 
@@ -592,11 +759,11 @@ End Function
 '           : back again afterwards to compute the hash.)
 '---------------------------------------------------------------------------------------
 '
-Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As String
+Private Function SanitizeXML() As String
 
     Dim curStart As Currency
     Dim cData As clsConcat
-    Dim strFile As String
+    Dim strXML As String
     Dim rxLine As VBScript_RegExp_55.RegExp
 
     If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next
@@ -605,15 +772,9 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
     cData.AppendOnAdd = vbCrLf
     Set rxLine = New VBScript_RegExp_55.RegExp
 
-    ' Read text from file
-    If HasUcs2Bom(strPath) Then
-        ' Table data macro XML is exported as UTF-16 LE BOM
-        strFile = ReadFile(strPath, "Unicode")
-    Else
-        strFile = ReadFile(strPath)
-    End If
     Perf.OperationStart "Sanitize XML"
     curStart = Perf.MicroTimer
+    strXML = this.strInput
 
     ' Exporting Table Def as XML does not properly encode ampersand character (See #314)
     ' Most likely if any ampersands are encoded correctly, all of them will be.
@@ -622,9 +783,9 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
         .Global = True
         ' Match &amp; &quot; &gt; &lt; etc...
         .Pattern = "&[A-z]{2,6};"
-        If Not .Test(strFile) Then
+        If Not .Test(strXML) Then
             ' Properly encode any embedded ampersand characters to make valid XML
-            strFile = Replace(strFile, "&", "&amp;")
+            strXML = Replace(strXML, "&", "&amp;")
         End If
     End With
 
@@ -635,9 +796,12 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
         Set objXml = New MSXML2.DOMDocument60
     End If
 
-    If objXml.LoadXML(strFile) = False Then
+    If objXml.LoadXML(strXML) = False Then
         Log.Error eelError, _
-                "Unable to parse the XML for file '" & strPath & "'. This may be due to containing malformed XML. Check the source XML document for validity. In some cases, this may be due to table data containing characters not allowed in XML documents.", ModuleName(Me) & ".SanitizeXML"
+            "Unable to parse the XML for file '" & Nz2(this.strFilePath, Me.ObjectName) & _
+            "'. This may be due to containing malformed XML. Check the source XML document for validity. " & _
+            "In some cases, this may be due to table data containing characters not allowed in XML documents.", _
+            ModuleName(Me) & ".SanitizeXML"
         Exit Function
     End If
 
@@ -681,17 +845,15 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
 
     Perf.OperationEnd
 
-    ' Write out sanitized XML file
-    WriteFile FormatXML(objXml), strPath
-
-    ' Return hash, if requested
-    If blnReturnHash Then SanitizeXML = GetStringHash(cData.GetStr, True)
+    ' Save the output
+    this.strOutput = FormatXML(objXml)
+    SanitizeXML = this.strOutput
 
     ' Show stats if debug turned on.
     Log.Add "    Sanitized in " & Format$(Perf.MicroTimer - curStart, "0.000") & " seconds.", Options.ShowDebug
 
     ' Log any errors
-    CatchAny eelError, "Error sanitizing XML file " & FSO.GetFileName(strPath), ModuleName(Me) & ".SanitizeXML"
+    CatchAny eelError, "Error sanitizing XML for " & Nz2(FSO.GetFileName(this.strFilePath), Me.ObjectName), ModuleName(Me) & ".SanitizeXML"
 
 End Function
 
@@ -827,6 +989,4 @@ End Function
 '
 Private Sub Class_Terminate()
     Set this.colBlocks = Nothing
-    Set this.cOutput = Nothing
-    Set this.cVBA = Nothing
 End Sub
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index de666e55..80cb3cf1 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -409,8 +409,11 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
                                 Optional cDbObjectClass As IDbComponent = Nothing) As String
 
     Dim strTempFile As String
+    Dim strAltFile As String
+    Dim strPrefix As String
     Dim strPrintSettingsFile As String
     Dim strHash As String
+    Dim cSanitize As clsSanitize
 
     On Error GoTo ErrHandler
 
@@ -421,7 +424,11 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
     Perf.OperationEnd
     VerifyPath strFile
 
+    ' Delete any existing source file
+    If FSO.FileExists(strFile) Then DeleteFile strFile
+
     ' Sanitize certain object types
+    Set cSanitize = New clsSanitize
     Select Case intType
         Case acForm, acReport
             With New clsDevMode
@@ -445,25 +452,44 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
                     If FSO.FileExists(strPrintSettingsFile) Then DeleteFile strPrintSettingsFile
                 End If
             End With
+
             ' Sanitizing converts to UTF-8
-            If FSO.FileExists(strFile) Then DeleteFile strFile
-            strHash = SanitizeFile(strTempFile, True)
-            FSO.MoveFile strTempFile, strFile
+            With cSanitize
+                .LoadSourceFile strTempFile
+                .ObjectName = FSO.GetBaseName(strFile)
+                WriteFile .Sanitize(ectObjectDefinition), strFile
+                strHash = .Hash
+
+                ' Process any VBA
+                strAltFile = SwapExtension(strFile, "cls")
+                If Options.SplitLayoutFromVBA And Len(.GetObjectVBA) Then
+                    ' Write VBA code as separate .cls file.
+                    WriteFile .GetObjectVBA, strAltFile
+                Else
+                    ' Remove any split VBA file
+                    If FSO.FileExists(strAltFile) Then DeleteFile strAltFile
+                End If
+            End With
 
         Case acQuery, acMacro
             ' Sanitizing converts to UTF-8
-            If FSO.FileExists(strFile) Then DeleteFile strFile
-            strHash = SanitizeFile(strTempFile, True)
-            FSO.MoveFile strTempFile, strFile
+            With cSanitize
+                .LoadSourceFile strTempFile
+                WriteFile .Sanitize(ectObjectDefinition), strFile
+                strHash = .Hash
+            End With
 
         ' Case acModule - Use VBE export instead.
 
         Case acTableDataMacro
             ' Table data macros are stored in XML format
+            ' The file may not exist if no TD Macro was found
             If FSO.FileExists(strTempFile) Then
-                strHash = SanitizeXML(strTempFile, True)
-                If FSO.FileExists(strFile) Then DeleteFile strFile
-                FSO.MoveFile strTempFile, strFile
+                With cSanitize
+                    .LoadSourceFile strTempFile
+                    WriteFile .Sanitize(ectXML), strFile
+                    strHash = .Hash
+                End With
             End If
 
         Case Else
@@ -472,6 +498,9 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
 
     End Select
 
+    ' Remove any leftover temp file.
+    If FSO.FileExists(strTempFile) Then DeleteFile strTempFile
+
     ' Normal exit
     On Error GoTo 0
 
@@ -590,10 +619,13 @@ Public Sub ExportCodeModule(strName As String, strFile As String)
 
     ' Export to a temp file so we can convert to UTF-8 encoding
     strTempFile = GetTempFile
-    CurrentVBProject.VBComponents(strName).Export strFile
+    CurrentVBProject.VBComponents(strName).Export strTempFile
 
     ' Sanitize the VBA code while reading the temp file
-    strContent = SanitizeVBA(ReadFile(strTempFile, GetSystemEncoding))
+    With New clsSanitize
+        .LoadString ReadFile(strTempFile, GetSystemEncoding)
+        strContent = .Sanitize(ectVBA)
+    End With
 
     ' Write the content as UTF-8 to the final destination
     WriteFile strContent, strFile

From 47c650647b50403e479fb4d3d96c54321b0c8f0c Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:21:57 -0500
Subject: [PATCH 26/73] Rename Sanitize class to SourceParser

This better reflects the expanded role of the class.
---
 .../modules/{clsSanitize.cls => clsSourceParser.cls}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename Version Control.accda.src/modules/{clsSanitize.cls => clsSourceParser.cls} (99%)

diff --git a/Version Control.accda.src/modules/clsSanitize.cls b/Version Control.accda.src/modules/clsSourceParser.cls
similarity index 99%
rename from Version Control.accda.src/modules/clsSanitize.cls
rename to Version Control.accda.src/modules/clsSourceParser.cls
index 9b353538..fdf79007 100644
--- a/Version Control.accda.src/modules/clsSanitize.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -2,7 +2,7 @@
 BEGIN
   MultiUse = -1  'True
 END
-Attribute VB_Name = "clsSanitize"
+Attribute VB_Name = "clsSourceParser"
 Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False

From c2ffccf0f017cf5f76a4be582ca9990cdb736916 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:27:43 -0500
Subject: [PATCH 27/73] Refactor for name change

---
 Version Control.accda.src/modules/clsDbTableData.cls |  2 +-
 Version Control.accda.src/modules/clsDbTableDef.cls  |  2 +-
 .../modules/clsSourceParser.cls                      |  4 ++--
 Version Control.accda.src/modules/modVCSUtility.bas  | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbTableData.cls b/Version Control.accda.src/modules/clsDbTableData.cls
index 4c5fbbbc..ed00152b 100644
--- a/Version Control.accda.src/modules/clsDbTableData.cls	
+++ b/Version Control.accda.src/modules/clsDbTableData.cls	
@@ -70,7 +70,7 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
                         Application.ExportXML acExportTable, m_Table.Name, strFile
                     End If
                     Perf.OperationEnd
-                    With New clsSanitize
+                    With New clsSourceParser
                         .LoadSourceFile strFile
                         WriteFile .Sanitize(ectXML), strFile
                     End With
diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls
index 880f850b..c119bee4 100644
--- a/Version Control.accda.src/modules/clsDbTableDef.cls	
+++ b/Version Control.accda.src/modules/clsDbTableDef.cls	
@@ -59,7 +59,7 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
         Perf.OperationEnd
 
         ' Rewrite sanitized XML as formatted UTF-8 content
-        With New clsSanitize
+        With New clsSourceParser
             .LoadSourceFile strFile
             DeleteFile strFile
             WriteFile .Sanitize(ectXML), strFile
diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index fdf79007..7f73ee67 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -8,7 +8,7 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Module    : modSanitize
+' Module    : clsSourceParser
 ' Author    : Adam Waller
 ' Date      : 12/4/2020
 ' Purpose   : Functions to sanitize files to remove non-essential metadata
@@ -417,7 +417,7 @@ Private Function SanitizeObject() As String 'strPath As String, blnReturnHash As
     ' Prepare VBA output (if used)
     If Not cVBA Is Nothing Then
         ' Build sanitized VBA string
-        With New clsSanitize
+        With New clsSourceParser
             .LoadString cVBA.GetStr
             this.strVBA = .Sanitize(ectVBA)
         End With
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 80cb3cf1..b90ba8ee 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -413,7 +413,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
     Dim strPrefix As String
     Dim strPrintSettingsFile As String
     Dim strHash As String
-    Dim cSanitize As clsSanitize
+    Dim cParser As clsSourceParser
 
     On Error GoTo ErrHandler
 
@@ -428,7 +428,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
     If FSO.FileExists(strFile) Then DeleteFile strFile
 
     ' Sanitize certain object types
-    Set cSanitize = New clsSanitize
+    Set cParser = New clsSourceParser
     Select Case intType
         Case acForm, acReport
             With New clsDevMode
@@ -454,7 +454,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
             End With
 
             ' Sanitizing converts to UTF-8
-            With cSanitize
+            With cParser
                 .LoadSourceFile strTempFile
                 .ObjectName = FSO.GetBaseName(strFile)
                 WriteFile .Sanitize(ectObjectDefinition), strFile
@@ -473,7 +473,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
 
         Case acQuery, acMacro
             ' Sanitizing converts to UTF-8
-            With cSanitize
+            With cParser
                 .LoadSourceFile strTempFile
                 WriteFile .Sanitize(ectObjectDefinition), strFile
                 strHash = .Hash
@@ -485,7 +485,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
             ' Table data macros are stored in XML format
             ' The file may not exist if no TD Macro was found
             If FSO.FileExists(strTempFile) Then
-                With cSanitize
+                With cParser
                     .LoadSourceFile strTempFile
                     WriteFile .Sanitize(ectXML), strFile
                     strHash = .Hash
@@ -622,7 +622,7 @@ Public Sub ExportCodeModule(strName As String, strFile As String)
     CurrentVBProject.VBComponents(strName).Export strTempFile
 
     ' Sanitize the VBA code while reading the temp file
-    With New clsSanitize
+    With New clsSourceParser
         .LoadString ReadFile(strTempFile, GetSystemEncoding)
         strContent = .Sanitize(ectVBA)
     End With

From 2d21eb696631e1d33c609c48fedcf3dec79ec4ac Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 3 Nov 2023 11:48:21 -0500
Subject: [PATCH 28/73] Verify ribbon active state when the add-in loads

Ensure that the ribbon is active when installing or activating the add-in. See #451
---
 .../modules/clsVersionControl.cls             |  4 ++++
 .../modules/modComAddIn.bas                   | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/Version Control.accda.src/modules/clsVersionControl.cls b/Version Control.accda.src/modules/clsVersionControl.cls
index 35c22c47..e0913d46 100644
--- a/Version Control.accda.src/modules/clsVersionControl.cls	
+++ b/Version Control.accda.src/modules/clsVersionControl.cls	
@@ -437,6 +437,10 @@ End Sub
 '
 Private Sub Class_Initialize()
     SaveState
+    ' When the class is initialized, make sure the ribbon is active (if installed).
+    ' This way if the COM add-in is not active, it will be automatically activated
+    ' when the add-in is opened from the [Database Tools\Add-ins] menu. (See #451)
+    modCOMAddIn.VerifyRibbon
 End Sub
 
 
diff --git a/Version Control.accda.src/modules/modComAddIn.bas b/Version Control.accda.src/modules/modComAddIn.bas
index f6e328ba..f1ff74c5 100644
--- a/Version Control.accda.src/modules/modComAddIn.bas	
+++ b/Version Control.accda.src/modules/modComAddIn.bas	
@@ -87,6 +87,9 @@ Public Sub VerifyComAddIn()
             ' Reload the add-in to refresh the ribbon
             UnloadAddIn
             LoadAddIn
+        Else
+            ' Verify that the ribbon is active
+            VerifyRibbon
         End If
     End If
 
@@ -107,6 +110,24 @@ Public Sub ReloadRibbon()
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : VerifyRibbon
+' Author    : Adam Waller
+' Date      : 11/3/2023
+' Purpose   : A lightweight function to verify that the ribbon add-in is active.
+'           : (It may get turned off if Access is opened in administrator mode.)
+'---------------------------------------------------------------------------------------
+'
+Public Sub VerifyRibbon()
+    Dim objAddIn As COMAddIn
+    Set objAddIn = GetCOMAddIn
+    If Not objAddIn Is Nothing Then
+        ' Activate the add-in if it is not currently active
+        If Not objAddIn.Connect Then objAddIn.Connect = True
+    End If
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : UninstallComAddIn
 ' Author    : Adam Waller

From da9f94abf16782d0e3868fb87f0b17b01d17c003 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 6 Nov 2023 16:11:33 -0600
Subject: [PATCH 29/73] Don't auto split layout/VBA for existing projects

For existing projects in git repositories, form and report layouts should not be automatically split from the VBA code classes. There is another process that will allow us to split the files while preserving history in both files, but this involves a couple commits and requires a clean branch. For existing projects, this is a manual upgrade (option changes). For new projects, it can happen by default.
---
 .../modules/clsGitIntegration.cls             | 81 +++++++++++++++----
 .../modules/clsOptions.cls                    | 60 ++++++++++++++
 2 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/Version Control.accda.src/modules/clsGitIntegration.cls b/Version Control.accda.src/modules/clsGitIntegration.cls
index 5d59acd3..ace9583d 100644
--- a/Version Control.accda.src/modules/clsGitIntegration.cls	
+++ b/Version Control.accda.src/modules/clsGitIntegration.cls	
@@ -35,11 +35,12 @@ Private Enum eGitCommand
     egcGetUntrackedFiles
     egcGetHeadCommit
     egcGetBranchName
-    egcSetTaggedCommit
     egcGetReproPath
     egcGetRevision
     egcGetStatusPorcelain
+    egcIsInsideTree
     ' Action commands
+    egcSetTaggedCommit
     egcInitialize
     egcAddAll
     egcCommit
@@ -101,6 +102,7 @@ Private Function RunGitCommand(intCmd As eGitCommand, Optional strArgument As St
         Case egcCheckoutNewBranch:      strCmd = "git checkout -b {MyArg}"
         Case egcCheckoutHeadToCurrent:  strCmd = "git checkout HEAD~ ."
         Case egcDeleteBranch:           strCmd = "git branch --delete {MyArg}"
+        Case egcIsInsideTree:           strCmd = "git rev-parse --is-inside-work-tree"
         Case Else
             Log.Error eelError, "Unrecognized Git Command Enum: " & intCmd
             Stop
@@ -111,7 +113,7 @@ Private Function RunGitCommand(intCmd As eGitCommand, Optional strArgument As St
 
     ' Run command, and get result
     Perf.OperationStart "Git Command (id:" & intCmd & ")"
-    strResult = ShellRun(strCmd)
+    strResult = ShellRun(strCmd, intCmd)
     Perf.OperationEnd
 
     ' Trim any trailing vbLf
@@ -170,7 +172,7 @@ End Function
 ' Purpose   : Returns the path to the root of the repository.
 '---------------------------------------------------------------------------------------
 '
-Public Function GetRepositoryRoot() As String
+Public Function GetRepositoryRoot(Optional blnFallBackToWorking As Boolean = True) As String
 
     Static strLastFolder As String  ' Working folder
     Static strLastRoot As String    ' Repository Root
@@ -180,6 +182,12 @@ Public Function GetRepositoryRoot() As String
     ' Determine the current working folder
     strWorking = GetWorkingFolder
 
+    ' Make sure git is actually installed
+    If Not Me.GitInstalled Then
+        If blnFallBackToWorking Then GetRepositoryRoot = strWorking
+        Exit Function
+    End If
+
     ' On first call, we will attempt to get the repository root from the working
     ' folder, or the export folder if a working folder is not specified.
     If strLastRoot = vbNullString Or (strLastFolder <> strWorking) Then
@@ -189,16 +197,20 @@ Public Function GetRepositoryRoot() As String
             strLastFolder = strWorking
             strLastRoot = vbNullString
             ' Recursively call this function to verify the path with git
-            GetRepositoryRoot = GetRepositoryRoot()
+            GetRepositoryRoot = GetRepositoryRoot(blnFallBackToWorking)
         Else
             ' Run git command from last folder
             strLastRoot = strLastFolder
             ' Use Git to look up root folder in repository.
             strLastRoot = Replace(RunGitCommand(egcGetReproPath), "/", PathSep) & PathSep
             If strLastRoot = PathSep Then
-                ' Might not be in a git repository. Fall back to working folder.
-                GetRepositoryRoot = strWorking
-                strLastRoot = strWorking
+                If blnFallBackToWorking Then
+                    ' Might not be in a git repository. Fall back to working folder.
+                    GetRepositoryRoot = strWorking
+                    strLastRoot = strWorking
+                Else
+                    GetRepositoryRoot = vbNullString
+                End If
             Else
                 ' Found the root folder. Return to caller.
                 GetRepositoryRoot = strLastRoot
@@ -221,7 +233,20 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Private Function GetWorkingFolder() As String
-    GetWorkingFolder = StripSlash(Nz2(Me.WorkingFolder, Options.GetExportFolder)) & PathSep
+
+    Dim strWorking As String
+
+    ' Avoid calling Options if the working folder is already defined to prevent
+    ' a possible stack overflow. (That's why we don't use Nz2() here)
+    If Len(Me.WorkingFolder) Then
+        strWorking = Me.WorkingFolder
+    Else
+        strWorking = Options.GetExportFolder
+    End If
+
+    ' Return path in consistent format
+    GetWorkingFolder = StripSlash(strWorking) & PathSep
+
 End Function
 
 
@@ -229,11 +254,28 @@ End Function
 ' Procedure : Version
 ' Author    : Adam Waller
 ' Date      : 3/10/2023
-' Purpose   : Return git version
+' Purpose   : Return git version (Cached between calls)
 '---------------------------------------------------------------------------------------
 '
 Public Function Version() As String
-    Version = Replace(RunGitCommand(egcGetVersion), "git version ", vbNullString)
+    Static strVersion As String
+    If strVersion = vbNullString Then strVersion = Replace(RunGitCommand(egcGetVersion), "git version ", vbNullString)
+    Version = strVersion
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : IsInsideRepository
+' Author    : Adam Waller
+' Date      : 11/6/2023
+' Purpose   : Returns true if the current working folder is inside a git repository.
+'---------------------------------------------------------------------------------------
+'
+Public Function IsInsideRepository() As Boolean
+    Dim strResult As String
+    If Me.GitInstalled Then
+        IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true")
+    End If
 End Function
 
 
@@ -356,7 +398,7 @@ End Sub
 ' Purpose   : Pass a git command to this function to return the result as a string.
 '---------------------------------------------------------------------------------------
 '
-Private Function ShellRun(strCmd As String) As String
+Private Function ShellRun(strCmd As String, intCmd As eGitCommand) As String
 
     Dim oShell As WshShell
     Dim strFile As String
@@ -366,10 +408,16 @@ Private Function ShellRun(strCmd As String) As String
 
     ' Build command line string
     With New clsConcat
-        ' Open command prompt in repository folder
-        .Add "cmd.exe /c cd ", GetRepositoryRoot
-        ' Run git command
-        .Add " & ", strCmd
+        Select Case intCmd
+            Case egcGetVersion
+                ' Run independent of repository
+                .Add "cmd.exe /c ", strCmd
+            Case Else
+                ' Open command prompt in repository folder
+                .Add "cmd.exe /c cd ", GetRepositoryRoot
+                ' Run git command
+                .Add " & ", strCmd
+        End Select
         ' Output to temp file
         .Add " > """, strFile, """"
         ' Execute command
@@ -478,8 +526,7 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Public Function GitInstalled() As Boolean
-    ' Expecting something like "git version 2.29.2.windows.2"
-    GitInstalled = InStr(1, RunGitCommand(egcGetVersion), "git version ") = 1
+    GitInstalled = (Len(Me.Version))
 End Function
 
 
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 4f091b0b..3368b3e5 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -275,6 +275,9 @@ End Sub
 '
 Private Sub Upgrade(ByRef dOptions As Dictionary)
 
+    Dim dFiles As Dictionary
+    Dim strPath As String
+
     ' 6/16/2021
     ' Aggressive sanitize to sanitize levels
     If dOptions.Exists("AggressiveSanitize") Then
@@ -287,9 +290,66 @@ Private Sub Upgrade(ByRef dOptions As Dictionary)
         End If
     End If
 
+    ' 11/3/2023
+    ' Check option to split VBA from object layout
+    If Not dOptions.Exists("SplitLayoutFromVBA") Then
+        ' The existing options file does not have this option defined.
+        ' See if we have any source files from previous exports.
+        If HasUnifiedLayoutFilesInGit(Me.GetExportFolder) Then
+            ' Set the option as false by default, and let the user
+            ' turn it on explicitly for this project.
+            ' (That way they are not forced to make a decision immediately)
+            Me.SplitLayoutFromVBA = False
+        Else
+            ' If we already have split files, or if this project is
+            ' being exported for the first time, leave the option at
+            ' the default setting.
+        End If
+    End If
+
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : HasUnifiedLayoutFilesInGit
+' Author    : Adam Waller
+' Date      : 11/3/2023
+' Purpose   : Returns true if the current project seems to have existing form or report
+'           : source files AND appears to be in a .git repository.
+'           : (This function is used when determining the default for splitting VBA
+'           :  from layout files in new projects.)
+'           : For performance reasons this is not a fully comprehensive check of every
+'           : possible source file, but should be a pretty good indication of whether
+'           : existing source files need to be split in git to preserve the history in
+'           : both source files.
+'---------------------------------------------------------------------------------------
+'
+Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean
+
+    Dim blnHasFiles As Boolean
+    Dim strFolder As String
+
+    ' See if we have any ".bas" files, but no corresponding ".cls" files in the
+    ' forms and reports export folders.
+    ' Hard-coding the folder names to avoid calling options.
+    If GetFileList(BuildPath2(strExportPath, "forms"), "*.bas").Count > 0 Then
+        blnHasFiles = (GetFileList(BuildPath2(strExportPath, "forms"), "*.cls").Count = 0)
+    ElseIf GetFileList(BuildPath2(strExportPath, "reports"), "*.bas").Count > 0 Then
+        blnHasFiles = (GetFileList(BuildPath2(strExportPath, "reports"), "*.cls").Count = 0)
+    End If
+
+    If blnHasFiles Then
+        ' Check to see if this folder is in a git repository
+        If Git.GitInstalled Then
+            ' Check export path
+            Git.WorkingFolder = strExportPath
+            HasUnifiedLayoutFilesInGit = Git.IsInsideRepository
+        End If
+    End If
+
+End Function
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : LoadProjectOptions
 ' Author    : Adam Waller

From 54e070ae8bf3618bf57f2cd2ec1aedab946005e9 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:35:24 -0600
Subject: [PATCH 30/73] Move print settings processing to clsSourceParser

This keeps the LoadComponentFromText function cleaner and easier to read.
---
 .../modules/clsDevMode.cls                    | 44 +++++--------------
 .../modules/clsSourceParser.cls               | 33 ++++++++++++++
 .../modules/modVCSUtility.bas                 |  7 +++
 3 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDevMode.cls b/Version Control.accda.src/modules/clsDevMode.cls
index 7482fbdb..c8b1f821 100644
--- a/Version Control.accda.src/modules/clsDevMode.cls	
+++ b/Version Control.accda.src/modules/clsDevMode.cls	
@@ -216,7 +216,7 @@ End Function
 ' Purpose   : Load sections from export file
 '---------------------------------------------------------------------------------------
 '
-Public Sub LoadFromExportFile(strFile As String)
+Public Sub LoadFromExportFile(strFileContent As String)
 
     Dim varLines As Variant
     Dim lngLine As Long
@@ -240,17 +240,11 @@ Public Sub LoadFromExportFile(strFile As String)
     ' Clear existing structures and create block classes.
     ClearStructures
 
-    If Not FSO.FileExists(strFile) Then Exit Sub
-
-    ' Open the export file, checking to see if it is in UCS format
-    If HasUcs2Bom(strFile) Then
-        varLines = Split(ReadFile(strFile, "Unicode"), vbCrLf)
-    Else
-        varLines = Split(ReadFile(strFile), vbCrLf)
-    End If
+    If Not Len(strFileContent) Then Exit Sub
 
     ' Read the text file line by line, loading the block data
     Perf.OperationStart "Read File DevMode"
+    varLines = Split(strFileContent, vbCrLf)
     For lngLine = 0 To UBound(varLines)
         strLine = Trim$(varLines(lngLine))
         ' Look for header if not inside block
@@ -315,7 +309,7 @@ Public Sub LoadFromExportFile(strFile As String)
     Next intBlock
     Perf.OperationEnd
 
-    CatchAny eelError, "Error loading printer settings from file: " & strFile, _
+    CatchAny eelError, "Error loading printer settings from file content.", _
         ModuleName(Me) & ".LoadFromExportFile", True, True
 
 End Sub
@@ -1007,18 +1001,6 @@ Public Sub ApplySettings(dSettings As Dictionary)
 End Sub
 
 
-'---------------------------------------------------------------------------------------
-' Procedure : GetPrintSettingsFileName
-' Author    : Adam Waller
-' Date      : 1/14/2021
-' Purpose   : Return the file name for the print vars json file.
-'---------------------------------------------------------------------------------------
-'
-Public Function GetPrintSettingsFileName(cDbObject As IDbComponent) As String
-    GetPrintSettingsFileName = cDbObject.BaseFolder & GetSafeFileName(cDbObject.Name) & ".json"
-End Function
-
-
 '---------------------------------------------------------------------------------------
 ' Procedure : AddToExportFile
 ' Author    : Adam Waller
@@ -1028,7 +1010,7 @@ End Function
 '           : file for import into the database using the loaded print settings.
 '---------------------------------------------------------------------------------------
 '
-Public Function AddToExportFile(strFile As String) As String
+Public Function AddToExportFile(strFileContent As String) As String
 
     Dim strTempFile As String
     Dim strLine As String
@@ -1040,15 +1022,12 @@ Public Function AddToExportFile(strFile As String) As String
 
     If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next
 
-    ' Load data from export file
-    strData = ReadFile(strFile)
-    varLines = Split(strData, vbCrLf)
-
     ' Use concatenation class for performance reasons.
     With New clsConcat
         .AppendOnAdd = vbCrLf
 
         ' Loop through lines in file, searching for location to insert blocks.
+        varLines = Split(strFileContent, vbCrLf)
         For lngLine = LBound(varLines) To UBound(varLines)
 
             ' Get single line
@@ -1088,16 +1067,13 @@ Public Function AddToExportFile(strFile As String) As String
             End If
         Next lngLine
 
-        ' Write to new file
-        strTempFile = GetTempFile
-        WriteFile .GetStr, strTempFile
-
+        ' Return content
+        AddToExportFile = .GetStr
     End With
 
-    ' Return path to temp file
-    AddToExportFile = strTempFile
-    CatchAny eelError, "Error adding to export file: " & strFile, _
+    CatchAny eelError, "Error adding print settings to export file.", _
         ModuleName(Me) & ".AddToExportFile", True, True
+
 End Function
 
 
diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index 7f73ee67..d158b225 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -164,6 +164,39 @@ Public Sub MergeVBA(strVbaCode As String)
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : MergePrintSettings
+' Author    : Adam Waller
+' Date      : 11/8/2023
+' Purpose   : Merge print settings into the current source file.
+'---------------------------------------------------------------------------------------
+'
+Public Sub MergePrintSettings(strJson As String)
+
+    Dim dSettings As Dictionary
+
+    ' Make sure we have some output
+    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+
+    ' Don't try to parse an empty string
+    If strJson = vbNullString Then Exit Sub
+
+    ' Read settings from JSON
+    Set dSettings = ParseJson(strJson)
+    If dSettings.Exists("Items") Then
+        With New clsDevMode
+            ' Load default printer settings, then overlay
+            ' settings saved with report.
+            .ApplySettings dSettings("Items")
+            ' Write the printer settings to the output content
+            this.strOutput = .AddToExportFile(this.strOutput)
+            this.blnOutputModified = True
+        End With
+    End If
+
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : SaveObjectVBA
 ' Author    : Adam Waller
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index b90ba8ee..9dbafb62 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -562,6 +562,13 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
                     End If
                 End With
             End If
+
+                ' Check for print settings file
+                strAltFile = SwapExtension(strFile, "json")
+                If FSO.FileExists(strAltFile) Then
+                    ' Merge the print settings into the source file content
+                    .MergePrintSettings ReadFile(strAltFile)
+                End If
     End Select
 
     ' Check UCS-2-LE requirement for the current database.

From 1390f2ce304c25a40269c66d62d142dd6475510c Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:37:32 -0600
Subject: [PATCH 31/73] Move source reading function

This is used in several areas, and allows us to maintain the source file encoding determination in a single location.
---
 .../modules/clsSourceParser.cls               | 27 +-------------
 .../modules/modVCSUtility.bas                 | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index d158b225..a0a55af8 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -45,33 +45,8 @@ Private this As udtThis
 '---------------------------------------------------------------------------------------
 '
 Public Function LoadSourceFile(strPath As String)
-
-    Dim strTempFile As String
-
     ResetContent
-
-    ' Read text from file, and split into lines
-    If HasUcs2Bom(strPath) Then
-        this.strInput = ReadFile(strPath, "Unicode")
-    Else
-        ' ADP projects may contain mixed Unicode content
-        If CurrentProject.ProjectType = acADP Then
-            strTempFile = GetTempFile
-            ConvertUcs2Utf8 strPath, strTempFile, False
-            this.strInput = ReadFile(strTempFile)
-            DeleteFile strTempFile
-        Else
-            If DbVersion <= 4 Then
-                ' Access 2000 format exports using system codepage
-                ' See issue #217
-                this.strInput = ReadFile(strPath, GetSystemEncoding)
-            Else
-                ' Newer versions export as UTF-8
-                this.strInput = ReadFile(strPath)
-            End If
-        End If
-    End If
-
+    this.strInput = ReadSourceFile(strPath)
 End Function
 
 
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 9dbafb62..2974bbff 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -1027,3 +1027,39 @@ Public Function PassesSchemaFilter(strItem As String, varFilterArray As Variant)
     PassesSchemaFilter = blnPass
 
 End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : ReadSourceFile
+' Author    : Adam Waller
+' Date      : 11/8/2023
+' Purpose   : Load source file content into a string. (Considers BOM and file type)
+'---------------------------------------------------------------------------------------
+'
+Public Function ReadSourceFile(strPath As String) As String
+
+    Dim strTempFile As String
+
+    ' Read text from file, and split into lines
+    If HasUcs2Bom(strPath) Then
+        ReadSourceFile = ReadFile(strPath, "Unicode")
+    Else
+        ' ADP projects may contain mixed Unicode content
+        If CurrentProject.ProjectType = acADP Then
+            strTempFile = GetTempFile
+            ConvertUcs2Utf8 strPath, strTempFile, False
+            ReadSourceFile = ReadFile(strTempFile)
+            DeleteFile strTempFile
+        Else
+            If DbVersion <= 4 Then
+                ' Access 2000 format exports using system codepage
+                ' See issue #217
+                ReadSourceFile = ReadFile(strPath, GetSystemEncoding)
+            Else
+                ' Newer versions export as UTF-8
+                ReadSourceFile = ReadFile(strPath)
+            End If
+        End If
+    End If
+
+End Function

From 932ac842dd4cd9fc16a3034176292be6ca17d15b Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:41:33 -0600
Subject: [PATCH 32/73] Rework merging source content before import

Cleaning this up to avoid reading and writing the file additional times while merging content from different sources. (Print settings, VBA code)
---
 .../modules/clsSourceParser.cls               | 31 +++++++++
 .../modules/modVCSUtility.bas                 | 63 +++++++++++--------
 2 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index a0a55af8..391d1c9d 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -29,6 +29,7 @@ Private Type udtThis
     lngSkipLines() As Long  ' Array of lines to skip
     lngSkipIndex As Long
     strFilePath As String   ' Path to loaded file
+    blnOutputModified As Boolean
     strInput As String
     strOutput As String
     strVBA As String
@@ -63,6 +64,30 @@ Public Function LoadString(ByVal strContent As String)
 End Function
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : GetOutput
+' Author    : Adam Waller
+' Date      : 11/8/2023
+' Purpose   : Wrapper to return output string
+'---------------------------------------------------------------------------------------
+'
+Public Function GetOutput() As String
+    GetOutput = this.strOutput
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : OutputModified
+' Author    : Adam Waller
+' Date      : 11/8/2023
+' Purpose   : Return true if the output has been modified
+'---------------------------------------------------------------------------------------
+'
+Public Property Get OutputModified() As Boolean
+    OutputModified = this.blnOutputModified
+End Property
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : ResetContent
 ' Author    : Adam Waller
@@ -76,6 +101,7 @@ Private Sub ResetContent()
         .strInput = vbNullString
         .strOutput = vbNullString
         .strVBA = vbNullString
+        .blnOutputModified = False
     End With
     Me.ObjectName = vbNullString
 End Sub
@@ -110,6 +136,9 @@ Public Sub MergeVBA(strVbaCode As String)
     Dim varLines As Variant
     Dim lngLine As Long
 
+    ' Make sure we have some output
+    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+
     ' Rebuild output using provided VBA code
     With New clsConcat
         .AppendOnAdd = vbCrLf
@@ -134,6 +163,8 @@ Public Sub MergeVBA(strVbaCode As String)
 
         ' Update output with combined content
         this.strOutput = .GetStr
+        this.strVBA = strVbaCode
+        this.blnOutputModified = True
     End With
 
 End Sub
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 2974bbff..641101cc 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -410,6 +410,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
 
     Dim strTempFile As String
     Dim strAltFile As String
+    Dim strContent As String
     Dim strPrefix As String
     Dim strPrintSettingsFile As String
     Dim strHash As String
@@ -431,13 +432,18 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
     Set cParser = New clsSourceParser
     Select Case intType
         Case acForm, acReport
+
+            ' Load content from file
+            strContent = ReadSourceFile(strTempFile)
+
+            ' Process any saved devmode settings
             With New clsDevMode
                 ' Build print settings file name.
-                strPrintSettingsFile = .GetPrintSettingsFileName(cDbObjectClass)
+                strPrintSettingsFile = SwapExtension(strFile, "json")
                 ' See if we are exporting print vars.
                 If Options.SavePrintVars = True Then
                     ' Grab the printer settings before sanitizing the file.
-                    .LoadFromExportFile strTempFile
+                    .LoadFromExportFile strContent
                     ' Only need to save print settings if they are different
                     ' from the default printer settings.
                     If (.GetHash <> VCSIndex.DefaultDevModeHash) And .HasData Then
@@ -455,7 +461,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
 
             ' Sanitizing converts to UTF-8
             With cParser
-                .LoadSourceFile strTempFile
+                .LoadString strContent
                 .ObjectName = FSO.GetBaseName(strFile)
                 WriteFile .Sanitize(ectObjectDefinition), strFile
                 strHash = .Hash
@@ -533,35 +539,24 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
                                 Optional cDbObjectClass As IDbComponent = Nothing)
 
     Dim strTempFile As String
-    Dim strPrintSettingsFile As String
     Dim strSourceFile As String
+    Dim strAltFile As String
+    Dim strContent As String
     Dim blnConvert As Boolean
     Dim dFile As Dictionary
+    Dim cParser As clsSourceParser
 
-    ' The path to the source file may change if we add print settings.
+    ' In most cases we are importing/converting the actual source file.
     strSourceFile = strFile
 
-    ' Add DevMode structures back into forms/reports
+    ' Add DevMode structures and VBA code back into forms/reports
     Select Case intType
         Case acForm, acReport
-            'Insert print settings (if needed)
-            If Not (cDbObjectClass Is Nothing) Then
-                With New clsDevMode
-                    ' Manually build the print settings file path since we don't have
-                    ' a database object we can use with the clsDevMode.GetPrintSettingsFileName
-                    strPrintSettingsFile = cDbObjectClass.BaseFolder & GetSafeFileName(strName) & ".json"
-                    Set dFile = ReadJsonFile(strPrintSettingsFile)
-                    ' Check to ensure dictionary was loaded
-                    If Not (dFile Is Nothing) Then
-                    ' Insert DevMode structures into file before importing.
-                        ' Load default printer settings, then overlay
-                        ' settings saved with report.
-                        .ApplySettings dFile("Items")
-                        ' Insert the settings into a combined export file.
-                        strSourceFile = .AddToExportFile(strFile)
-                    End If
-                End With
-            End If
+
+            ' Read file content. (Should be UTF-8)
+            strContent = ReadFile(strFile)
+            With New clsSourceParser
+                .LoadString strContent
 
                 ' Check for print settings file
                 strAltFile = SwapExtension(strFile, "json")
@@ -569,6 +564,22 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
                     ' Merge the print settings into the source file content
                     .MergePrintSettings ReadFile(strAltFile)
                 End If
+
+                ' For forms and reports, check for VBA code file that needs to be merged
+                strAltFile = SwapExtension(strFile, "cls")
+                If FSO.FileExists(strAltFile) Then
+                    ' Found a companion class file.
+                    .MergeVBA ReadFile(strAltFile)
+                End If
+
+                ' Write ouput to a new file if anything has changed
+                If .OutputModified Then
+                    strSourceFile = GetTempFile
+                    WriteFile .GetOutput, strSourceFile
+                End If
+
+            End With
+
     End Select
 
     ' Check UCS-2-LE requirement for the current database.
@@ -604,8 +615,8 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
         Perf.OperationEnd
     End If
 
-    ' Remove any temporary combined source file
-    If strSourceFile <> strFile Then DeleteFile strSourceFile
+    ' Clean up any temp file
+    If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
 
 End Sub
 

From 9069232968a7e3eb82a87abee2b9060cb4e3f63d Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:45:32 -0600
Subject: [PATCH 33/73] Add support to overlay VBA code after import

For some (rare) situations, it is necessary to push the VBA code directly using VBE to preserve certain extended characters that may be corrupted in a regular round-trip export/import cycle.
---
 .../modules/clsSourceParser.cls               | 58 +++++++++++++++
 .../modules/modVCSUtility.bas                 | 74 +++++++++++++++++++
 2 files changed, 132 insertions(+)

diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index 391d1c9d..c418160b 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -526,6 +526,64 @@ Private Function BuildOutput(varLines As Variant) As String
 End Function
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : StripClassHeader
+' Author    : Adam Waller
+' Date      : 10/24/2023
+' Purpose   : Strip the class header section from the VBA content. (Remove the version
+'           : and VBE attributes lines that come before the actual VBA code.)
+'---------------------------------------------------------------------------------------
+'
+Public Function StripClassHeader(strContent As String, blnStripNameOnly As Boolean) As String
+
+    Dim lngLine As Long
+    Dim varLines As Variant
+    Dim strLine As String
+    Dim blnPastHeader As Boolean
+
+    ' Split code into lines
+    varLines = Split(strContent, vbCrLf)
+
+    With New clsConcat
+        .AppendOnAdd = vbCrLf
+
+        ' Skip the header information saved in the VBA class
+        For lngLine = 0 To UBound(varLines)
+            If Not blnPastHeader Then
+                strLine = varLines(lngLine)
+                If blnStripNameOnly Then
+                    If StartsWith(strLine, "Attribute VB_Name = ") Then
+                        ' Just skip that line. Keep everything else.
+                        blnPastHeader = True
+                    Else
+                        .Add CStr(varLines(lngLine))
+                    End If
+                Else
+                    Select Case True
+                        Case (strLine = "VERSION 1.0 CLASS")
+                        Case (strLine = "BEGIN")
+                        Case (strLine = "  MultiUse = -1  'True")
+                        Case (strLine = "END")
+                        Case StartsWith(strLine, "Attribute VB_")
+                        Case Else
+                            blnPastHeader = True
+                            .Add CStr(varLines(lngLine))
+                    End Select
+                End If
+            Else
+                ' Add remaining lines
+                .Add CStr(varLines(lngLine))
+            End If
+        Next lngLine
+
+        ' remove trailing CrLf and return result
+        .Remove 2
+        StripClassHeader = .GetStr
+    End With
+
+End Function
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : SkipLine
 ' Author    : Adam Waller
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 641101cc..179f19b6 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -542,6 +542,7 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
     Dim strSourceFile As String
     Dim strAltFile As String
     Dim strContent As String
+    Dim blnVbaOverlay As Boolean
     Dim blnConvert As Boolean
     Dim dFile As Dictionary
     Dim cParser As clsSourceParser
@@ -570,6 +571,7 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
                 If FSO.FileExists(strAltFile) Then
                     ' Found a companion class file.
                     .MergeVBA ReadFile(strAltFile)
+                    blnVbaOverlay = RequiresOverlay(.GetObjectVBA)
                 End If
 
                 ' Write ouput to a new file if anything has changed
@@ -618,6 +620,9 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
     ' Clean up any temp file
     If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
 
+    ' Check for VBA overlay
+    If blnVbaOverlay Then OverlayCodeModule strName, SwapExtension(strFile, "cls")
+
 End Sub
 
 
@@ -654,6 +659,75 @@ Public Sub ExportCodeModule(strName As String, strFile As String)
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : OverlayCodeModule
+' Author    : Adam Waller
+' Date      : 10/24/2023
+' Purpose   : Overlay VBA code from an object's *.cls file to the form or report
+'           : Note that this opens the object in design view, which may slow the build
+'           : process if a large number of items are invovled.
+'---------------------------------------------------------------------------------------
+'
+Public Sub OverlayCodeModule(strName As String, strClassFile As String)
+
+    Dim objModule As VBIDE.CodeModule
+    Dim strContent As String
+    Dim intType As AcObjectType
+    Dim strShortName As String
+    Dim cParser As clsSourceParser
+
+    LogUnhandledErrors
+    'On Error Resume Next
+    Set objModule = CurrentVBProject.VBComponents(strName).CodeModule
+    If CatchAny(eelError, "Could not find code module for " & strName, ModuleName & ".OverlayCodeModule") Then Exit Sub
+
+    ' Read class file content
+    strContent = ReadFile(strClassFile)
+    If strContent = vbNullString Then
+        Log.Error eelError, "Unable to read " & strClassFile, ModuleName & ".OverlayCodeModule"
+        Exit Sub
+    End If
+
+    ' Get object type and short name
+    If strName Like "Form_*" Then
+        intType = acForm
+        strShortName = Mid$(strName, 6)
+        DoCmd.OpenForm strShortName, acDesign, , , , acHidden
+    ElseIf strName Like "Report_*" Then
+        intType = acReport
+        strShortName = Mid$(strName, 8)
+        DoCmd.OpenReport strShortName, acViewDesign, , , acHidden
+    End If
+
+    ' Overlay the VBA code, replacing any existing code.
+    Set cParser = New clsSourceParser
+    objModule.DeleteLines 1, objModule.CountOfLines
+    objModule.AddFromString cParser.StripClassHeader(strContent, False)
+
+    ' Close any form or report object
+    Select Case intType
+        Case acForm, acReport
+            DoCmd.Close intType, strShortName, acSaveYes
+    End Select
+
+End Sub
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : RequiresOverlay
+' Author    : Adam Waller
+' Date      : 11/2/2023
+' Purpose   : Returns true if we need to overlay the VBA code through VBE for a form
+'           : or report object.
+'---------------------------------------------------------------------------------------
+'
+Private Function RequiresOverlay(strVbaCode As String) As Boolean
+    If modEncoding.GetSystemEncoding(True) = "utf-8" Then
+        RequiresOverlay = StringHasExtendedASCII(strVbaCode)
+    End If
+End Function
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : RemoveNonBuiltInReferences
 ' Author    : Adam Waller

From 8f1649a30886f23eaa4b478b06b356d5a7ed1f83 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 16:18:47 -0600
Subject: [PATCH 34/73] Code cleanup and minor tweaks

---
 Version Control.accda.src/modules/clsDbForm.cls         | 2 +-
 Version Control.accda.src/modules/clsDbModule.cls       | 2 +-
 Version Control.accda.src/modules/clsDbReport.cls       | 2 +-
 Version Control.accda.src/modules/clsDevMode.cls        | 2 --
 Version Control.accda.src/modules/clsGitIntegration.cls | 1 -
 Version Control.accda.src/modules/clsOptions.cls        | 4 ----
 Version Control.accda.src/modules/clsSourceParser.cls   | 6 ++----
 Version Control.accda.src/modules/clsSqlFormatter.cls   | 1 +
 Version Control.accda.src/modules/modFunctions.bas      | 4 ++--
 Version Control.accda.src/modules/modInstall.bas        | 4 ++--
 Version Control.accda.src/modules/modVCSUtility.bas     | 8 +-------
 11 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbForm.cls b/Version Control.accda.src/modules/clsDbForm.cls
index 4e54ff3e..f3ca77c8 100644
--- a/Version Control.accda.src/modules/clsDbForm.cls	
+++ b/Version Control.accda.src/modules/clsDbForm.cls	
@@ -70,7 +70,7 @@ Private Sub IDbComponent_Import(strFile As String)
     End If
 
     ' Load the form from the source file
-    LoadComponentFromText acForm, strName, strFile, Me
+    LoadComponentFromText acForm, strName, strFile
     Set m_Form = CurrentProject.AllForms(strName)
     VCSIndex.Update Me, eatImport, GetCodeModuleHash(IDbComponent_ComponentType, strName)
 
diff --git a/Version Control.accda.src/modules/clsDbModule.cls b/Version Control.accda.src/modules/clsDbModule.cls
index 79c13336..e342a840 100644
--- a/Version Control.accda.src/modules/clsDbModule.cls	
+++ b/Version Control.accda.src/modules/clsDbModule.cls	
@@ -145,7 +145,7 @@ Private Function ParseSourceFile(strFile As String, strName As String) As udtVba
             blnIsClass = True
             Exit For
         End If
-        ' Exit after 10 lines
+        ' Exit after 9 lines
         If lngLine > 8 Then Exit For
     Next lngLine
 
diff --git a/Version Control.accda.src/modules/clsDbReport.cls b/Version Control.accda.src/modules/clsDbReport.cls
index 203ac99f..755c5539 100644
--- a/Version Control.accda.src/modules/clsDbReport.cls	
+++ b/Version Control.accda.src/modules/clsDbReport.cls	
@@ -58,7 +58,7 @@ Private Sub IDbComponent_Import(strFile As String)
     If Not strFile Like "*.bas" Then Exit Sub
 
     strName = GetObjectNameFromFileName(strFile)
-    LoadComponentFromText acReport, strName, strFile, Me
+    LoadComponentFromText acReport, strName, strFile
     Set m_Report = CurrentProject.AllReports(strName)
     VCSIndex.Update Me, eatImport, GetFileHash(strFile), GetCodeModuleHash(IDbComponent_ComponentType, strName)
 
diff --git a/Version Control.accda.src/modules/clsDevMode.cls b/Version Control.accda.src/modules/clsDevMode.cls
index c8b1f821..f51e763a 100644
--- a/Version Control.accda.src/modules/clsDevMode.cls	
+++ b/Version Control.accda.src/modules/clsDevMode.cls	
@@ -1012,10 +1012,8 @@ End Sub
 '
 Public Function AddToExportFile(strFileContent As String) As String
 
-    Dim strTempFile As String
     Dim strLine As String
     Dim varLines As Variant
-    Dim strData As String
     Dim lngLine As Long
     Dim blnFound As Boolean
     Dim blnInBlock As Boolean
diff --git a/Version Control.accda.src/modules/clsGitIntegration.cls b/Version Control.accda.src/modules/clsGitIntegration.cls
index ace9583d..8b71d0cf 100644
--- a/Version Control.accda.src/modules/clsGitIntegration.cls	
+++ b/Version Control.accda.src/modules/clsGitIntegration.cls	
@@ -272,7 +272,6 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Public Function IsInsideRepository() As Boolean
-    Dim strResult As String
     If Me.GitInstalled Then
         IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true")
     End If
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 3368b3e5..1247615e 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -275,9 +275,6 @@ End Sub
 '
 Private Sub Upgrade(ByRef dOptions As Dictionary)
 
-    Dim dFiles As Dictionary
-    Dim strPath As String
-
     ' 6/16/2021
     ' Aggressive sanitize to sanitize levels
     If dOptions.Exists("AggressiveSanitize") Then
@@ -327,7 +324,6 @@ End Sub
 Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean
 
     Dim blnHasFiles As Boolean
-    Dim strFolder As String
 
     ' See if we have any ".bas" files, but no corresponding ".cls" files in the
     ' forms and reports export folders.
diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index c418160b..b1cfd187 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -222,8 +222,8 @@ End Function
 ' Purpose   : Return a hash of the sanitized content
 '---------------------------------------------------------------------------------------
 '
-Public Function Hash(Optional blnWithBOM As Boolean = True) As String
-    Hash = GetStringHash(this.strOutput, blnWithBOM)
+Public Function Hash(Optional blnWithBom As Boolean = True) As String
+    Hash = GetStringHash(this.strOutput, blnWithBom)
 End Function
 
 
@@ -246,8 +246,6 @@ Private Function SanitizeObject() As String 'strPath As String, blnReturnHash As
     Dim blnIsReport As Boolean
     Dim blnIsPassThroughQuery As Boolean
     Dim curStart As Currency
-    Dim strTempFile As String
-    Dim strContent As String
     Dim cVBA As clsConcat
 
     If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next
diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index bdbe7866..ea683dba 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -1628,6 +1628,7 @@ End Function
 ' Author    : Adam Waller
 ' Date      : 8/18/2023
 ' Purpose   : Print out AscW indexes of each character in the string.
+'           : (Use this when building case statements)
 '---------------------------------------------------------------------------------------
 '
 Private Function GetAscWFromString(strText As String) As String
diff --git a/Version Control.accda.src/modules/modFunctions.bas b/Version Control.accda.src/modules/modFunctions.bas
index 2f20d2b6..a19e3e4a 100644
--- a/Version Control.accda.src/modules/modFunctions.bas	
+++ b/Version Control.accda.src/modules/modFunctions.bas	
@@ -910,10 +910,10 @@ End Function
 '           : I.e.  c:\test.bas > c:\test.cls
 '---------------------------------------------------------------------------------------
 '
-Public Function SwapExtension(strFilePath As String, strNewExtension As String) As String
+Public Function SwapExtension(strFilePath As String, strNewExtensionWithoutDelimiter As String) As String
     Dim strCurrentExt As String
     strCurrentExt = FSO.GetExtensionName(strFilePath)
-    SwapExtension = Left(strFilePath, Len(strFilePath) - Len(strCurrentExt)) & strNewExtension
+    SwapExtension = Left(strFilePath, Len(strFilePath) - Len(strCurrentExt)) & strNewExtensionWithoutDelimiter
 End Function
 
 
diff --git a/Version Control.accda.src/modules/modInstall.bas b/Version Control.accda.src/modules/modInstall.bas
index f2a331bc..8945635f 100644
--- a/Version Control.accda.src/modules/modInstall.bas	
+++ b/Version Control.accda.src/modules/modInstall.bas	
@@ -113,7 +113,7 @@ Public Sub InstallVCSAddin(blnTrustFolder As Boolean, blnUseRibbon As Boolean, b
         .blnTrustAddInFolder = blnTrustFolder
         If .strInstallFolder <> strInstallFolder Then
             ' Attempt to migrate any saved user settings files
-            MigrateUserFiles .strInstallFolder, strInstallFolder, GetFilePathsInFolder(.strInstallFolder)
+            MigrateUserFiles strInstallFolder, GetFilePathsInFolder(.strInstallFolder)
             ' Update install folder to new path
             .strInstallFolder = strInstallFolder
         End If
@@ -305,7 +305,7 @@ End Function
 '           : the source file.
 '---------------------------------------------------------------------------------------
 '
-Private Sub MigrateUserFiles(strFromFolder As String, strToFolder As String, colNames As Dictionary)
+Private Sub MigrateUserFiles(strToFolder As String, colNames As Dictionary)
 
     Dim varKey As Variant
     Dim strFile As String
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 179f19b6..cc09512f 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -411,7 +411,6 @@ Public Function SaveComponentAsText(intType As AcObjectType, _
     Dim strTempFile As String
     Dim strAltFile As String
     Dim strContent As String
-    Dim strPrefix As String
     Dim strPrintSettingsFile As String
     Dim strHash As String
     Dim cParser As clsSourceParser
@@ -533,10 +532,7 @@ End Function
 ' Purpose   : Load the object into the database from the saved source file.
 '---------------------------------------------------------------------------------------
 '
-Public Sub LoadComponentFromText(intType As AcObjectType, _
-                                strName As String, _
-                                strFile As String, _
-                                Optional cDbObjectClass As IDbComponent = Nothing)
+Public Sub LoadComponentFromText(intType As AcObjectType, strName As String, strFile As String)
 
     Dim strTempFile As String
     Dim strSourceFile As String
@@ -544,8 +540,6 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _
     Dim strContent As String
     Dim blnVbaOverlay As Boolean
     Dim blnConvert As Boolean
-    Dim dFile As Dictionary
-    Dim cParser As clsSourceParser
 
     ' In most cases we are importing/converting the actual source file.
     strSourceFile = strFile

From 4f9247de70f04466509ac7f6dd9cd5657b09d09a Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:02:50 -0600
Subject: [PATCH 35/73] Fix bugs in build logic

Uncovered these while testing.
---
 Version Control.accda.src/modules/clsDevMode.cls      | 2 +-
 Version Control.accda.src/modules/clsSourceParser.cls | 4 ++--
 Version Control.accda.src/modules/modVCSUtility.bas   | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDevMode.cls b/Version Control.accda.src/modules/clsDevMode.cls
index f51e763a..d1438712 100644
--- a/Version Control.accda.src/modules/clsDevMode.cls	
+++ b/Version Control.accda.src/modules/clsDevMode.cls	
@@ -240,7 +240,7 @@ Public Sub LoadFromExportFile(strFileContent As String)
     ' Clear existing structures and create block classes.
     ClearStructures
 
-    If Not Len(strFileContent) Then Exit Sub
+    If Len(strFileContent) = 0 Then Exit Sub
 
     ' Read the text file line by line, loading the block data
     Perf.OperationStart "Read File DevMode"
diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls
index b1cfd187..1a1e3e26 100644
--- a/Version Control.accda.src/modules/clsSourceParser.cls	
+++ b/Version Control.accda.src/modules/clsSourceParser.cls	
@@ -137,7 +137,7 @@ Public Sub MergeVBA(strVbaCode As String)
     Dim lngLine As Long
 
     ' Make sure we have some output
-    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+    If Len(this.strOutput) = 0 Then this.strOutput = this.strInput
 
     ' Rebuild output using provided VBA code
     With New clsConcat
@@ -182,7 +182,7 @@ Public Sub MergePrintSettings(strJson As String)
     Dim dSettings As Dictionary
 
     ' Make sure we have some output
-    If Not Len(this.strOutput) Then this.strOutput = this.strInput
+    If Len(this.strOutput) = 0 Then this.strOutput = this.strInput
 
     ' Don't try to parse an empty string
     If strJson = vbNullString Then Exit Sub
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index cc09512f..21bf7f7d 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -611,8 +611,10 @@ Public Sub LoadComponentFromText(intType As AcObjectType, strName As String, str
         Perf.OperationEnd
     End If
 
-    ' Clean up any temp file
-    If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
+    ' Clean up any additional temp file used in the building process
+    If strFile <> strSourceFile Then
+        If FSO.FileExists(strSourceFile) Then DeleteFile strSourceFile
+    End If
 
     ' Check for VBA overlay
     If blnVbaOverlay Then OverlayCodeModule strName, SwapExtension(strFile, "cls")

From 925b019806cd3d2f55d575913ed4e3ab35dc61ae Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:04:08 -0600
Subject: [PATCH 36/73] Check for diff tool before comparing objects

---
 .../forms/frmVCSConflictList.bas                    | 13 +++++++++----
 Version Control.accda.src/modules/clsViewDiff.cls   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSConflictList.bas b/Version Control.accda.src/forms/frmVCSConflictList.bas
index 8fce9846..c530c465 100644
--- a/Version Control.accda.src/forms/frmVCSConflictList.bas	
+++ b/Version Control.accda.src/forms/frmVCSConflictList.bas	
@@ -16,10 +16,8 @@ Begin Form
     Width =5040
     DatasheetFontHeight =11
     ItemSuffix =31
-    Left =435
-    Top =2250
-    Right =12315
-    Bottom =7335
+    Right =15720
+    Bottom =11745
     RecSrcDt = Begin
         0x9bf1b7f2f3a6e540
     End
@@ -481,6 +479,13 @@ Private Sub txtDiff_Click()
     cboResolution.SetFocus
     DoEvents
 
+    ' Make sure we have a valid tool defined
+    If Not (modObjects.Diff.HasValidCompareTool) Then
+        MsgBox2 "No Compare Tool Defined", _
+            "Please specify a compare tool (i.e. WinMerge, VSCode) in the add-in options.", , vbExclamation
+        Exit Sub
+    End If
+
     ' Make sure we have a file name to compare
     strFileName = Nz(txtFileName)
     If strFileName = vbNullString Then
diff --git a/Version Control.accda.src/modules/clsViewDiff.cls b/Version Control.accda.src/modules/clsViewDiff.cls
index b895c808..72579031 100644
--- a/Version Control.accda.src/modules/clsViewDiff.cls	
+++ b/Version Control.accda.src/modules/clsViewDiff.cls	
@@ -219,7 +219,7 @@ End Function
 '           : valid for use.
 '---------------------------------------------------------------------------------------
 '
-Private Function HasValidCompareTool() As Boolean
+Public Function HasValidCompareTool() As Boolean
 
     ' Check the current option for compare tool.
     Select Case Me.ToolName

From 7b8be8faef5984c3cccc4c88a0c11e3cf7ce5995 Mon Sep 17 00:00:00 2001
From: Tanarri <Tanarri@users.noreply.github.com>
Date: Fri, 10 Nov 2023 15:24:54 +0100
Subject: [PATCH 37/73] Implement correction according to rubberduck (#453)

replace VBA commands:
format with format$
trim with trim$
---
 Version Control.accda.src/modules/clsPerformance.cls | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index bf141388..fa5f62dc 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -447,14 +447,14 @@ Public Function GetReports() As String
             .Add ListResult("Category", "Count", "Seconds", lngCol), vbCrLf, strSpacer
             For Each varKey In this.Categories.Keys
                 .Add ListResult(CStr(varKey), CStr(this.Categories(varKey).Count), _
-                    Format(this.Categories(varKey).Total, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
+                    Format$(this.Categories(varKey).Total, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
                 ' Add to totals
                 dblCount = dblCount + this.Categories(varKey).Count
                 curTotal = curTotal + this.Categories(varKey).Total
             Next varKey
             .Add strSpacer
             .Add ListResult("TOTALS:", CStr(dblCount), _
-                Format(curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
+                Format$(curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
             .Add strSpacer
             .Add vbNullString
         End If
@@ -467,13 +467,13 @@ Public Function GetReports() As String
             .Add ListResult("Operations", "Count", "Seconds", lngCol), vbCrLf, strSpacer
             For Each varKey In this.Operations.Keys
                 .Add ListResult(CStr(varKey), CStr(this.Operations(varKey).Count), _
-                    Format(this.Operations(varKey).Total, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
+                    Format$(this.Operations(varKey).Total, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
                 curTotal = curTotal + this.Operations(varKey).Total
             Next varKey
             .Add strSpacer
             If Not this.Overall Is Nothing Then
                 .Add ListResult("Other Operations", vbNullString, _
-                    Format(this.Overall.Total - curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
+                    Format$(this.Overall.Total - curTotal, "0." & String$(this.intDigitsAfterDecimal, "0")), lngCol)
                 .Add strSpacer
             End If
             .Add vbNullString
@@ -608,7 +608,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     ' Build our list of records
     For Each varKey In dItems.Keys
         ' Create a record like this: "00062840.170000|Export Form Objects       ..."
-        strRecord = Format(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 255)
+        strRecord = Format$(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 255)
         ' Add to array.
         varItems(lngCnt) = strRecord
         ' Increment counter for array
@@ -624,7 +624,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     For lngCnt = dItems.Count - 1 To 0 Step -1
         ' Parse key from record (text after first pipe character)
         strRecord = varItems(lngCnt)
-        varKey = Trim(Mid$(strRecord, InStr(1, strRecord, "|") + 1))
+        varKey = Trim$(Mid$(strRecord, InStr(1, strRecord, "|") + 1))
         ' Reference performance item class
         Set cItem = dItems(varKey)
         ' Add to dictionary of resorted items

From 9577eab41ed214a9ebf5425a2931f4301d8b147a Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:08:11 -0600
Subject: [PATCH 38/73] Add wiki page for Split Files

Describes the process in a little more detail.
---
 Wiki/Split-Files.md             |  29 +++++++++++++++++++++++++++++
 Wiki/img/split-files-dialog.jpg | Bin 0 -> 46257 bytes
 2 files changed, 29 insertions(+)
 create mode 100644 Wiki/Split-Files.md
 create mode 100644 Wiki/img/split-files-dialog.jpg

diff --git a/Wiki/Split-Files.md b/Wiki/Split-Files.md
new file mode 100644
index 00000000..211085d1
--- /dev/null
+++ b/Wiki/Split-Files.md
@@ -0,0 +1,29 @@
+One of the challenges with the .git system is that when a single file is split into two different files the line history *might* follow one of the files, but not both. You loose the line history in one or both files.
+
+That might be a serious problem if you have years of history that you are wanting to preserve. Thankfully, there is a [technical workaround](https://devblogs.microsoft.com/oldnewthing/20190919-00/?p=102904) that does allow you to preserve the history in both files.
+
+# Please Read Before Splitting Files in Existing .git Projects
+
+You can turn on the option and simply perform an export to split the files, **but if you want to preserve the .git history in both files**, please read this section carefully. This add-in includes a utility to help you split the files while retaining the line history in both files. Because this involves **committing** to the repository as part of the process, I want to clarify exactly how this works.
+
+# How This Works
+
+Because this isn't a built-in feature in .git, we need to implement a bit of a clever workaround as documented by Raymond Chen in [this article](https://devblogs.microsoft.com/oldnewthing/20190919-00/?p=102904). In a nutshell, we will create a (temporary) new branch in git, rename the file in the new branch, restore the original file, then merge the new branch back into the original. This will result in two files that both carry the history of the original file.
+
+# Before You Start
+
+You will need to run this process from a **clean branch**. If you have any outstanding changes, please commit or discard them before splitting files. Be aware that this will create **two additional commits** in your repository, so it can be helpful to do this for batches of files, rather than individually for each file.
+
+# Select and Split Layout from VBA
+
+On the VCS ribbon, click Open the **Advanced Tools > Split Files** to open the following dialog.
+
+![split-files-dialog](img/split-files-dialog.jpg)
+
+Click the *Add Forms and Reports...* link to automatically load in the source files for the forms and reports in the current project and create the corresponding `*.cls` files.
+
+Click the button to Split Files. This will begin the automated process of splitting the files while preserving change history. Details and the full output of the git commands can be found in `git.log` in the source files folder.
+
+With the files now split, turn on the VCS option to **Split Layout from VBA** and run an export. At this point you should see both source files modified for each object as the layout is removed from the class file, and the VBA is removed from the layout file.
+
+That's it! Now the VBA code changes can be tracked in the `*.cls` file, and the layout in the `*.bas` file.
\ No newline at end of file
diff --git a/Wiki/img/split-files-dialog.jpg b/Wiki/img/split-files-dialog.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e6884a8143d6d29dbc038b4e97afa0791a65e0b5
GIT binary patch
literal 46257
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
XGyY9+{{2Loe^y}Xzxg@EZ*%_xy^DF0

literal 0
HcmV?d00001


From 07bc57ccaac96960bcc67cfbfa331d5502906f21 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:48:48 -0600
Subject: [PATCH 39/73] Add change hook for options

Used for special processing when certain options change.
---
 .../forms/frmVCSOptions.bas                   | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSOptions.bas b/Version Control.accda.src/forms/frmVCSOptions.bas
index df1e3ac2..08870769 100644
--- a/Version Control.accda.src/forms/frmVCSOptions.bas	
+++ b/Version Control.accda.src/forms/frmVCSOptions.bas	
@@ -16,10 +16,10 @@ Begin Form
     Width =10080
     DatasheetFontHeight =11
     ItemSuffix =252
-    Left =3225
-    Top =2430
-    Right =13890
-    Bottom =14175
+    Left =-25575
+    Top =1500
+    Right =-255
+    Bottom =14085
     RecSrcDt = Begin
         0x79e78b777268e540
     End
@@ -4296,6 +4296,9 @@ Private Sub MapControlsToOptions(eAction As eMapAction)
                                 If eAction = emaClassToForm Then
                                     ctl = CallByName(Options, strKey, VbGet)
                                 ElseIf eAction = emaFormToClass Then
+                                    ' Check for any hooks on option change
+                                    OnOptionChange strKey, Nz(ctl.Value)
+                                    ' Set the option value
                                     CallByName Options, strKey, VbLet, Nz(ctl.Value)
                                 End If
                         End Select
@@ -4328,6 +4331,46 @@ Private Sub MapControlsToOptions(eAction As eMapAction)
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : OnOptionChange
+' Author    : Adam Waller
+' Date      : 11/9/2023
+' Purpose   : A hook to run special code or processing when specific options are changed
+'           : from their existing values. Add any specific rules here.
+'---------------------------------------------------------------------------------------
+'
+Private Sub OnOptionChange(strName As String, varNewValue As Variant)
+
+    Dim blnChanged As Boolean
+
+    ' Determine if the option was changed
+    blnChanged = Not (CVar(CallByName(Options, strName, VbGet)) = varNewValue)
+    If Not blnChanged Then Exit Sub
+
+    ' Define actual rules here
+    Select Case strName
+
+        ' If a user turns on the option to split files
+        Case "SplitLayoutFromVBA"
+            If varNewValue = True Then
+                If Git.Installed Then
+                    If Git.IsInsideRepository Then
+                        ' Prompt user with suggestion
+                        If MsgBox2("May I make a Suggestion?", _
+                            "This project appears to be within a Git repository. This add-in includes a special utility " & _
+                            "that can split the files (layout and VBA) while preserving this history of previous changes in BOTH files.", _
+                            "Would you like to see additional information on this from the wiki?", vbQuestion + vbYesNo) = vbYes Then
+                            FollowHyperlink "https://github.com/joyfullservice/msaccess-vcs-addin/wiki/Split-Files"
+                        End If
+                    End If
+                End If
+            End If
+
+    End Select
+
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : cmdAddOtherTableData_Click
 ' Author    : Adam Waller

From e2049faaa48903cdbef98ebd1af4f00efbb2837a Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:49:49 -0600
Subject: [PATCH 40/73] Automate splitting forms and reports

Adds a link and some code automation to split forms and reports in existing projects to layout and class files.
---
 .../forms/frmVCSSplitFiles.bas                | 106 +++++++++++++++++-
 1 file changed, 103 insertions(+), 3 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSSplitFiles.bas b/Version Control.accda.src/forms/frmVCSSplitFiles.bas
index d26fe877..9958cbb7 100644
--- a/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
+++ b/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
@@ -18,7 +18,7 @@ Begin Form
     ItemSuffix =245
     Left =-25575
     Top =1500
-    Right =-5310
+    Right =-255
     Bottom =14085
     RecSrcDt = Begin
         0x79e78b777268e540
@@ -276,13 +276,13 @@ Begin Form
                             OverlapFlags =85
                             Left =720
                             Top =1440
-                            Width =4020
+                            Width =2280
                             Height =315
                             Name ="Label241"
                             Caption ="List of files to split:"
                             LayoutCachedLeft =720
                             LayoutCachedTop =1440
-                            LayoutCachedWidth =4740
+                            LayoutCachedWidth =3000
                             LayoutCachedHeight =1755
                         End
                     End
@@ -866,6 +866,43 @@ Begin Form
                         End
                     End
                 End
+                Begin CommandButton
+                    FontUnderline = NotDefault
+                    OverlapFlags =85
+                    Left =4020
+                    Top =1440
+                    Width =2820
+                    TabIndex =3
+                    Name ="cmdAddFormsAndReports"
+                    Caption ="Add Forms and Reports..."
+                    OnClick ="[Event Procedure]"
+                    HorizontalAnchor =1
+                    BackStyle =0
+
+                    CursorOnHover =1
+                    LayoutCachedLeft =4020
+                    LayoutCachedTop =1440
+                    LayoutCachedWidth =6840
+                    LayoutCachedHeight =1800
+                    Alignment =3
+                    ForeThemeColorIndex =10
+                    ForeTint =100.0
+                    Gradient =0
+                    BackColor =14262935
+                    BackThemeColorIndex =-1
+                    BackTint =100.0
+                    OldBorderStyle =0
+                    BorderColor =15321539
+                    BorderThemeColorIndex =-1
+                    BorderTint =100.0
+                    HoverColor =15321539
+                    HoverThemeColorIndex =-1
+                    HoverTint =100.0
+                    PressedColor =13072231
+                    PressedThemeColorIndex =-1
+                    PressedShade =100.0
+                    Overlaps =1
+                End
             End
         End
     End
@@ -879,6 +916,69 @@ Option Compare Database
 Option Explicit
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : cmdAddFormsAndReports_Click
+' Author    : Adam Waller
+' Date      : 11/9/2023
+' Purpose   : Add the forms and reports source files for the project. Doing this
+'           : intelligently by only adding items that have a VBA code module.
+'---------------------------------------------------------------------------------------
+'
+Private Sub cmdAddFormsAndReports_Click()
+
+    Dim intType As AcObjectType
+    Dim cComponent As IDbComponent
+    Dim varKey As Variant
+    Dim strFile As String
+    Dim strPrefix As String
+    Dim cList As clsConcat
+
+    ' Prepare class for new list
+    Set cList = New clsConcat
+    cList.AppendOnAdd = vbCrLf
+
+    ' Process for forms and reports (2 to 3)
+    DoCmd.Hourglass True
+    For intType = acForm To acReport
+
+        ' Get component type
+        If intType = acForm Then
+            Set cComponent = New clsDbForm
+            strPrefix = "Form_"
+        ElseIf intType = acReport Then
+            Set cComponent = New clsDbReport
+            strPrefix = "Report_"
+        End If
+
+        ' Loop through files
+        For Each varKey In cComponent.GetFileList.Keys
+            strFile = SwapExtension(CStr(varKey), "cls")
+            ' Skip files that already exist
+            If Not FSO.FileExists(strFile) Then
+                ' Check for code module marker in source file
+                If InStr(1, ReadFile(CStr(varKey)), "CodeBehindForm") > 0 Then
+                    ' Add to list of files to split
+                    cList.Add CStr(varKey), "|", strFile
+                End If
+            End If
+        Next varKey
+    Next intType
+    DoCmd.Hourglass False
+    cmdSplitFiles.SetFocus
+
+    ' See if we found any files to split.
+    If cList.Length > 0 Then
+        ' Replace existing content.
+        txtFileList = cList.GetStr
+    Else
+        MsgBox2 "No Relevant Files Found", _
+            "Could not find any combined form or report source files that contained VBA modules", _
+            , vbInformation
+    End If
+
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : cmdSplitFiles_Click
 ' Author    : Adam Waller

From e723123437405db5c5321071b4ae10d13fe41325 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:51:10 -0600
Subject: [PATCH 41/73] Rename function

Git.Installed sounds better than Git.GitInstalled, and will almost always be called in the context of the git class.
---
 Version Control.accda.src/forms/frmVCSSplitFiles.bas    | 4 ++--
 Version Control.accda.src/modules/clsGitIntegration.cls | 8 ++++----
 Version Control.accda.src/modules/clsOptions.cls        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSSplitFiles.bas b/Version Control.accda.src/forms/frmVCSSplitFiles.bas
index 9958cbb7..a73b3411 100644
--- a/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
+++ b/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
@@ -1012,7 +1012,7 @@ Private Sub cmdSplitFiles_Click()
             AddToArray strPaths, varPaths(0)
             AddToArray strNew, varPaths(1)
         Else
-            If UBound(varPaths) = 0 And Trim(varPaths(0)) = vbNullString Then
+            If Len(Trim(varEntries(lngLine))) = 0 Then
                 ' Ignore blank lines
             Else
                 strError = "Expecting two file paths, separated by | character. See line: '" & varPaths(0) & "'"
@@ -1033,7 +1033,7 @@ Private Sub cmdSplitFiles_Click()
 
         ' Require clean branch with git installation
         If Not Git.IsCleanBranch Then strError = "Cannot split files in Git when changes are present in the branch"
-        If Not Git.GitInstalled Then strError = "Git must be installed to use this tool."
+        If Not Git.Installed Then strError = "Git must be installed to use this tool."
 
         ' Make sure we don't have any errors with the Git commands
         If Len(strError) Then
diff --git a/Version Control.accda.src/modules/clsGitIntegration.cls b/Version Control.accda.src/modules/clsGitIntegration.cls
index 8b71d0cf..e30e355b 100644
--- a/Version Control.accda.src/modules/clsGitIntegration.cls	
+++ b/Version Control.accda.src/modules/clsGitIntegration.cls	
@@ -183,7 +183,7 @@ Public Function GetRepositoryRoot(Optional blnFallBackToWorking As Boolean = Tru
     strWorking = GetWorkingFolder
 
     ' Make sure git is actually installed
-    If Not Me.GitInstalled Then
+    If Not Me.Installed Then
         If blnFallBackToWorking Then GetRepositoryRoot = strWorking
         Exit Function
     End If
@@ -272,7 +272,7 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Public Function IsInsideRepository() As Boolean
-    If Me.GitInstalled Then
+    If Me.Installed Then
         IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true")
     End If
 End Function
@@ -524,8 +524,8 @@ End Function
 ' Purpose   : Returns true if git is installed.
 '---------------------------------------------------------------------------------------
 '
-Public Function GitInstalled() As Boolean
-    GitInstalled = (Len(Me.Version))
+Public Function Installed() As Boolean
+    Installed = (Len(Me.Version))
 End Function
 
 
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 1247615e..9769b4f8 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -336,7 +336,7 @@ Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean
 
     If blnHasFiles Then
         ' Check to see if this folder is in a git repository
-        If Git.GitInstalled Then
+        If Git.Installed Then
             ' Check export path
             Git.WorkingFolder = strExportPath
             HasUnifiedLayoutFilesInGit = Git.IsInsideRepository

From de4602e2e05cf39c16bfadc85e619765cf1e17ce Mon Sep 17 00:00:00 2001
From: hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:56:40 -0500
Subject: [PATCH 42/73] Fixes #354 and Fixes #452 (#454)

From @hecon5:

Bump version minor number because it's not clear that the index will allow round trip from prior types in all cases; it worked on my machine, but that may not always be the case.

The date types for the index are handled natively by modJsonConverter and should import/export correctly regardless of user's date / time zone or date encoding on machines.
---
 Version Control.accda.src/dbs-properties.json |   2 +-
 .../modules/clsOptions.cls                    |   1 +
 .../modules/clsVCSIndex.cls                   |  10 +-
 .../modules/modJsonConverter.bas              | 283 ++----------------
 .../modules/modUtcConverter.bas               |  31 +-
 5 files changed, 57 insertions(+), 270 deletions(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index a4853bdb..58b40237 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.25",
+      "Value": "4.1.0",
       "Type": 10
     },
     "Auto Compact": {
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 9769b4f8..915d11ac 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -654,6 +654,7 @@ Private Sub Class_Initialize()
 
     ' Other run-time options
     JsonOptions.AllowUnicodeChars = True
+    JsonOptions.ConvertDateToIso = True
 
 End Sub
 
diff --git a/Version Control.accda.src/modules/clsVCSIndex.cls b/Version Control.accda.src/modules/clsVCSIndex.cls
index 837a3ce1..396e42e6 100644
--- a/Version Control.accda.src/modules/clsVCSIndex.cls	
+++ b/Version Control.accda.src/modules/clsVCSIndex.cls	
@@ -118,7 +118,7 @@ Public Sub Save(Optional strInFolder As String)
                 varValue = CallByName(Me, CStr(varKey), VbGet)
                 ' Save blank dates as null
                 If Right(varKey, 4) = "Date" Then
-                    m_dIndex(varKey) = ZNDate(CStr(varValue))
+                    m_dIndex(varKey) = ZNDate(varValue)
                 Else
                     m_dIndex(varKey) = CStr(varValue)
                 End If
@@ -222,14 +222,14 @@ Public Function Update(cItem As IDbComponent, intAction As eIndexOperationType,
         If dteDateTime = 0 Then dteDateTime = Now
         Select Case intAction
             Case eatExport, eatAltExport
-                .Item("ExportDate") = CStr(dteDateTime)
+                .Item("ExportDate") = dteDateTime
             Case eatImport
-                .Item("ImportDate") = CStr(dteDateTime)
+                .Item("ImportDate") = dteDateTime
         End Select
 
         ' Save timestamp of exported source file.
         dteDateTime = GetLastModifiedDate(cItem.SourceFile)
-        .Item("SourceModified") = ZNDate(CStr(dteDateTime))
+        .Item("SourceModified") = ZNDate(dteDateTime)
 
         ' Save hash of file properties
         .Item("FilePropertiesHash") = GetFilePropertyHash(cItem.SourceFile)
@@ -494,7 +494,7 @@ Public Function GetModifiedSourceFiles(cCategory As IDbComponent) As Dictionary
                     strPath = Join(Array("Components", cCategory.Category, FSO.GetFileName(strFile), "SourceModified"), PathSep)
                     ' Compare modified date of file with modified date in index.
                     ' File is considered not modified if the index date matches the file modification date.
-                    blnModified = Not (dNZ(m_dIndex, strPath) = CStr(GetLastModifiedDate(strFile)))
+                    blnModified = Not (dNZ(m_dIndex, strPath) = GetLastModifiedDate(strFile))
                 End If
                 ' Add modified files to collection
                 If blnModified Then .Add strFile, vbNullString
diff --git a/Version Control.accda.src/modules/modJsonConverter.bas b/Version Control.accda.src/modules/modJsonConverter.bas
index 1fe4fba9..d7c0ea7b 100644
--- a/Version Control.accda.src/modules/modJsonConverter.bas	
+++ b/Version Control.accda.src/modules/modJsonConverter.bas	
@@ -157,6 +157,10 @@ Private Type json_Options
     ' The solidus (/) is not required to be escaped, use this option to escape them as \/ in ConvertToJson
     EscapeSolidus As Boolean
 
+    ' Before version 2.3.1 dates were converted to UTC in ConvertToJson method, but not when json was parsed.
+    ' Convert datetime values to UTC/ISO8601 (false, slower) or dont change local <-> global times (true, faster)
+    ConvertDateToIso As Boolean
+
     ' Allow Unicode characters in JSON text. Set to True to use native Unicode or false for escaped values.
     AllowUnicodeChars As Boolean
 End Type
@@ -240,11 +244,16 @@ Public Function ConvertToJson(ByVal JsonValue As Variant, Optional ByVal Whitesp
     Select Case VBA.VarType(JsonValue)
     Case VBA.vbNull
         ConvertToJson = "null"
+
     Case VBA.vbDate
         ' Date
-        json_DateStr = ConvertToIso(VBA.CDate(JsonValue))
-
+        If JsonOptions.ConvertDateToIso Then
+            json_DateStr = ConvertToIsoTime(VBA.CDate(JsonValue))
+        Else
+            json_DateStr = VBA.CStr(JsonValue)
+        End If
         ConvertToJson = """" & json_DateStr & """"
+
     Case VBA.vbString
         ' String (or large number encoded as string)
         If Not JsonOptions.UseDoubleForLargeNumbers And json_StringIsLargeNumber(JsonValue) Then
@@ -556,7 +565,9 @@ Private Function json_ParseValue(json_String As String, ByRef json_Index As Long
     End Select
 End Function
 
-Private Function json_ParseString(json_String As String, ByRef json_Index As Long) As String
+Private Function json_ParseString(ByRef json_String As String _
+                                , ByRef json_Index As Long) As Variant
+
     Dim json_Quote As String
     Dim json_Char As String
     Dim json_Code As String
@@ -609,6 +620,10 @@ Private Function json_ParseString(json_String As String, ByRef json_Index As Lon
             End Select
         Case json_Quote
             json_ParseString = json_BufferToString(json_Buffer, json_BufferPosition)
+            If JsonOptions.ConvertDateToIso Then ' Only convert and test for condition if needed for speed boost.
+                If (json_ParseString Like "####-##-##T##:##:##*") Then _
+                    json_ParseString = ParseIso(VBA.CStr$(json_ParseString)) ' Return as a date
+            End If
             json_Index = json_Index + 1
             Exit Function
         Case Else
@@ -881,265 +896,7 @@ Private Function json_BufferToString(ByRef json_Buffer As String, ByVal json_Buf
     End If
 End Function
 
-''
-' VBA-UTC v1.0.6
-' (c) Tim Hall - https://github.com/VBA-tools/VBA-UtcConverter
-'
-' UTC/ISO 8601 Converter for VBA
-'
-' Errors:
-' 10011 - UTC parsing error
-' 10012 - UTC conversion error
-' 10013 - ISO 8601 parsing error
-' 10014 - ISO 8601 conversion error
-'
-' @module UtcConverter
-' @author tim.hall.engr@gmail.com
-' @license MIT (http://www.opensource.org/licenses/mit-license.php)
-'' ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ '
-
-' (Declarations moved to top)
-
-' ============================================= '
-' Public Methods
-' ============================================= '
-
-''
-' Parse UTC date to local date
-'
-' @method ParseUtc
-' @param {Date} UtcDate
-' @return {Date} Local date
-' @throws 10011 - UTC parsing error
-''
-Public Function ParseUtc(utc_UtcDate As Date) As Date
-    On Error GoTo utc_ErrorHandling
-
-#If Mac Then
-    ParseUtc = utc_ConvertDate(utc_UtcDate)
-#Else
-    Dim utc_TimeZoneInfo As utc_TIME_ZONE_INFORMATION
-    Dim utc_LocalDate As utc_SYSTEMTIME
-
-    utc_GetTimeZoneInformation utc_TimeZoneInfo
-    utc_SystemTimeToTzSpecificLocalTime utc_TimeZoneInfo, utc_DateToSystemTime(utc_UtcDate), utc_LocalDate
-
-    ParseUtc = utc_SystemTimeToDate(utc_LocalDate)
-#End If
-
-    Exit Function
-
-utc_ErrorHandling:
-    Err.Raise 10011, "UtcConverter.ParseUtc", "UTC parsing error: " & Err.Number & " - " & Err.Description
-End Function
-
-''
-' Convert local date to UTC date
-'
-' @method ConvertToUrc
-' @param {Date} utc_LocalDate
-' @return {Date} UTC date
-' @throws 10012 - UTC conversion error
-''
-Public Function ConvertToUtc(utc_LocalDate As Date) As Date
-    On Error GoTo utc_ErrorHandling
-
-#If Mac Then
-    ConvertToUtc = utc_ConvertDate(utc_LocalDate, utc_ConvertToUtc:=True)
-#Else
-    Dim utc_TimeZoneInfo As utc_TIME_ZONE_INFORMATION
-    Dim utc_UtcDate As utc_SYSTEMTIME
 
-    utc_GetTimeZoneInformation utc_TimeZoneInfo
-    utc_TzSpecificLocalTimeToSystemTime utc_TimeZoneInfo, utc_DateToSystemTime(utc_LocalDate), utc_UtcDate
-
-    ConvertToUtc = utc_SystemTimeToDate(utc_UtcDate)
-#End If
-
-    Exit Function
-
-utc_ErrorHandling:
-    Err.Raise 10012, "UtcConverter.ConvertToUtc", "UTC conversion error: " & Err.Number & " - " & Err.Description
+Private Function ConvertToIso(utc_LocalDate As Date) As String
+    ConvertToIso = ConvertToUTCISO8601TimeStamp(utc_LocalDate)
 End Function
-
-''
-' Parse ISO 8601 date string to local date
-'
-' @method ParseIso
-' @param {Date} utc_IsoString
-' @return {Date} Local date
-' @throws 10013 - ISO 8601 parsing error
-''
-Public Function ParseIso(utc_IsoString As String) As Date
-    On Error GoTo utc_ErrorHandling
-
-    Dim utc_Parts() As String
-    Dim utc_DateParts() As String
-    Dim utc_TimeParts() As String
-    Dim utc_OffsetIndex As Long
-    Dim utc_HasOffset As Boolean
-    Dim utc_NegativeOffset As Boolean
-    Dim utc_OffsetParts() As String
-    Dim utc_Offset As Date
-
-    utc_Parts = VBA.Split(utc_IsoString, "T")
-    utc_DateParts = VBA.Split(utc_Parts(0), "-")
-    ParseIso = VBA.DateSerial(VBA.CInt(utc_DateParts(0)), VBA.CInt(utc_DateParts(1)), VBA.CInt(utc_DateParts(2)))
-
-    If UBound(utc_Parts) > 0 Then
-        If VBA.InStr(utc_Parts(1), "Z") Then
-            utc_TimeParts = VBA.Split(VBA.Replace(utc_Parts(1), "Z", vbNullString), ":")
-        Else
-            utc_OffsetIndex = VBA.InStr(1, utc_Parts(1), "+")
-            If utc_OffsetIndex = 0 Then
-                utc_NegativeOffset = True
-                utc_OffsetIndex = VBA.InStr(1, utc_Parts(1), "-")
-            End If
-
-            If utc_OffsetIndex > 0 Then
-                utc_HasOffset = True
-                utc_TimeParts = VBA.Split(VBA.Left$(utc_Parts(1), utc_OffsetIndex - 1), ":")
-                utc_OffsetParts = VBA.Split(VBA.Right$(utc_Parts(1), Len(utc_Parts(1)) - utc_OffsetIndex), ":")
-
-                Select Case UBound(utc_OffsetParts)
-                Case 0
-                    utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), 0, 0)
-                Case 1
-                    utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), VBA.CInt(utc_OffsetParts(1)), 0)
-                Case 2
-                    ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
-                    utc_Offset = TimeSerial(VBA.CInt(utc_OffsetParts(0)), VBA.CInt(utc_OffsetParts(1)), Int(VBA.Val(utc_OffsetParts(2))))
-                End Select
-
-                If utc_NegativeOffset Then: utc_Offset = -utc_Offset
-            Else
-                utc_TimeParts = VBA.Split(utc_Parts(1), ":")
-            End If
-        End If
-
-        Select Case UBound(utc_TimeParts)
-        Case 0
-            ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), 0, 0)
-        Case 1
-            ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), VBA.CInt(utc_TimeParts(1)), 0)
-        Case 2
-            ' VBA.Val does not use regional settings, use for seconds to avoid decimal/comma issues
-            ParseIso = ParseIso + VBA.TimeSerial(VBA.CInt(utc_TimeParts(0)), VBA.CInt(utc_TimeParts(1)), Int(VBA.Val(utc_TimeParts(2))))
-        End Select
-
-        ParseIso = ParseUtc(ParseIso)
-
-        If utc_HasOffset Then
-            ParseIso = ParseIso - utc_Offset
-        End If
-    End If
-
-    Exit Function
-
-utc_ErrorHandling:
-    Err.Raise 10013, "UtcConverter.ParseIso", "ISO 8601 parsing error for " & utc_IsoString & ": " & Err.Number & " - " & Err.Description
-End Function
-
-''
-' Convert local date to ISO 8601 string
-'
-' @method ConvertToIso
-' @param {Date} utc_LocalDate
-' @return {Date} ISO 8601 string
-' @throws 10014 - ISO 8601 conversion error
-''
-Public Function ConvertToIso(utc_LocalDate As Date) As String
-    On Error GoTo utc_ErrorHandling
-
-    ConvertToIso = VBA.Format$(ConvertToUtc(utc_LocalDate), "yyyy-mm-ddTHH:mm:ss.000Z")
-
-    Exit Function
-
-utc_ErrorHandling:
-    Err.Raise 10014, "UtcConverter.ConvertToIso", "ISO 8601 conversion error: " & Err.Number & " - " & Err.Description
-End Function
-
-' ============================================= '
-' Private Functions
-' ============================================= '
-
-#If Mac Then
-
-Private Function utc_ConvertDate(utc_Value As Date, Optional utc_ConvertToUtc As Boolean = False) As Date
-    Dim utc_ShellCommand As String
-    Dim utc_Result As utc_ShellResult
-    Dim utc_Parts() As String
-    Dim utc_DateParts() As String
-    Dim utc_TimeParts() As String
-
-    If utc_ConvertToUtc Then
-        utc_ShellCommand = "date -ur `date -jf '%Y-%m-%d %H:%M:%S' " & _
-            "'" & VBA.Format$(utc_Value, "yyyy-mm-dd HH:mm:ss") & "' " & _
-            " +'%s'` +'%Y-%m-%d %H:%M:%S'"
-    Else
-        utc_ShellCommand = "date -jf '%Y-%m-%d %H:%M:%S %z' " & _
-            "'" & VBA.Format$(utc_Value, "yyyy-mm-dd HH:mm:ss") & " +0000' " & _
-            "+'%Y-%m-%d %H:%M:%S'"
-    End If
-
-    utc_Result = utc_ExecuteInShell(utc_ShellCommand)
-
-    If utc_Result.utc_Output = "" Then
-        Err.Raise 10015, "UtcConverter.utc_ConvertDate", "'date' command failed"
-    Else
-        utc_Parts = Split(utc_Result.utc_Output, " ")
-        utc_DateParts = Split(utc_Parts(0), "-")
-        utc_TimeParts = Split(utc_Parts(1), ":")
-
-        utc_ConvertDate = DateSerial(utc_DateParts(0), utc_DateParts(1), utc_DateParts(2)) + _
-            TimeSerial(utc_TimeParts(0), utc_TimeParts(1), utc_TimeParts(2))
-    End If
-End Function
-
-Private Function utc_ExecuteInShell(utc_ShellCommand As String) As utc_ShellResult
-#If VBA7 Then
-    Dim utc_File As LongPtr
-    Dim utc_Read As LongPtr
-#Else
-    Dim utc_File As Long
-    Dim utc_Read As Long
-#End If
-
-    Dim utc_Chunk As String
-
-    On Error GoTo utc_ErrorHandling
-    utc_File = utc_popen(utc_ShellCommand, "r")
-
-    If utc_File = 0 Then: Exit Function
-
-    Do While utc_feof(utc_File) = 0
-        utc_Chunk = VBA.Space$(50)
-        utc_Read = CLng(utc_fread(utc_Chunk, 1, Len(utc_Chunk) - 1, utc_File))
-        If utc_Read > 0 Then
-            utc_Chunk = VBA.Left$(utc_Chunk, CLng(utc_Read))
-            utc_ExecuteInShell.utc_Output = utc_ExecuteInShell.utc_Output & utc_Chunk
-        End If
-    Loop
-
-utc_ErrorHandling:
-    utc_ExecuteInShell.utc_ExitCode = CLng(utc_pclose(utc_File))
-End Function
-
-#Else
-
-Private Function utc_DateToSystemTime(utc_Value As Date) As utc_SYSTEMTIME
-    utc_DateToSystemTime.utc_wYear = VBA.Year(utc_Value)
-    utc_DateToSystemTime.utc_wMonth = VBA.Month(utc_Value)
-    utc_DateToSystemTime.utc_wDay = VBA.Day(utc_Value)
-    utc_DateToSystemTime.utc_wHour = VBA.Hour(utc_Value)
-    utc_DateToSystemTime.utc_wMinute = VBA.Minute(utc_Value)
-    utc_DateToSystemTime.utc_wSecond = VBA.Second(utc_Value)
-    utc_DateToSystemTime.utc_wMilliseconds = 0
-End Function
-
-Private Function utc_SystemTimeToDate(utc_Value As utc_SYSTEMTIME) As Date
-    utc_SystemTimeToDate = DateSerial(utc_Value.utc_wYear, utc_Value.utc_wMonth, utc_Value.utc_wDay) + _
-        TimeSerial(utc_Value.utc_wHour, utc_Value.utc_wMinute, utc_Value.utc_wSecond)
-End Function
-
-#End If
diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index fa996bb5..d980bfa5 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -297,14 +297,43 @@ utc_ErrorHandling:
     Err.Raise 10012, "UtcConverter.ConvertToUtc", "UTC conversion error: " & Err.Number & " - " & Err.Description
 End Function
 
+
+Public Function TimeStampDate(Optional LocalTimeStamp As Boolean = False) As Date
+
+    Dim TimeStampOut As Date
+
+#If Mac Then
+    ' I'm sure there's a way to do this better, but this works for now.
+    TimeStampOut = ConvertToUtc(VBA.Now())
+    If Not LocalTimeStamp Then TimeStampOut = ConvertToUtc(TimeStampOut)
+
+#Else
+    Dim tSysTime As utc_SYSTEMTIME
+
+    If Not LocalTimeStamp Then
+        GetSystemTime tSysTime
+        TimeStampOut = utc_SystemTimeToDate(tSysTime)
+
+    Else
+        GetLocalTime tSysTime
+        TimeStampOut = utc_SystemTimeToDate(tSysTime)
+    End If
+#End If
+
+    TimeStampDate = TimeStampOut
+
+End Function
+
+
 ' NOTE: As of now, "LocalTimeStamp" does nothing on a Mac; need to build "getTimeZoneOffset" for Mac, and I don't have one.
 '       It will, however, output a UTC string that is correct for local time (eg, in the correct UTC for the given local time)
 '       I also don't know how to get millisecond values out of a Mac, so that'll return zero, as well.
 Public Function ISO8601TimeStamp(Optional IncludeMilliseconds As Boolean = True _
                                 , Optional LocalTimeStamp As Boolean = False) As String
-    Dim CurrentTimeVB As Date
 
+    Dim CurrentTimeVB As Date
     Dim tString_Buffer As StringBufferCache
+
 ' Note: This varies slightly from ConvertToISO8601Time because it's faster to do on Windows if you have SYSTEMTIME
 #If Mac Then
     ' I'm sure there's a way to do this better, but this works for now.

From d5e76f722a2dd633a873e3360cf14b52039cee90 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:02:39 -0600
Subject: [PATCH 43/73] Add performance timing to ISO date parsing

See #354
---
 Version Control.accda.src/modules/modJsonConverter.bas | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modJsonConverter.bas b/Version Control.accda.src/modules/modJsonConverter.bas
index d7c0ea7b..77d9f229 100644
--- a/Version Control.accda.src/modules/modJsonConverter.bas	
+++ b/Version Control.accda.src/modules/modJsonConverter.bas	
@@ -248,7 +248,9 @@ Public Function ConvertToJson(ByVal JsonValue As Variant, Optional ByVal Whitesp
     Case VBA.vbDate
         ' Date
         If JsonOptions.ConvertDateToIso Then
+            Perf.OperationStart "Convert JSON Date to ISO"
             json_DateStr = ConvertToIsoTime(VBA.CDate(JsonValue))
+            Perf.OperationEnd
         Else
             json_DateStr = VBA.CStr(JsonValue)
         End If
@@ -621,8 +623,11 @@ Private Function json_ParseString(ByRef json_String As String _
         Case json_Quote
             json_ParseString = json_BufferToString(json_Buffer, json_BufferPosition)
             If JsonOptions.ConvertDateToIso Then ' Only convert and test for condition if needed for speed boost.
-                If (json_ParseString Like "####-##-##T##:##:##*") Then _
+                If (json_ParseString Like "####-##-##T##:##:##*") Then
+                    Perf.OperationStart "Parse JSON ISO Date"
                     json_ParseString = ParseIso(VBA.CStr$(json_ParseString)) ' Return as a date
+                    Perf.OperationEnd
+                End If
             End If
             json_Index = json_Index + 1
             Exit Function

From 286679d1846f259d6db6b421e8485ec79f16657e Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:03:32 -0600
Subject: [PATCH 44/73] Add high-performance wrapper functions

Avoids the use of RegEx when it is not necessary to parse a standard date format. #354
---
 .../modules/modUtcConverter.bas               | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index d980bfa5..7d58a827 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -466,7 +466,7 @@ Public Function ParseIso(utc_IsoString As String _
     Exit Function
 #Else
     If UBound(utc_Parts) > 0 Then
-        utc_DateTimeOut = ConvDateUTC(utc_Parts(0)) + ConvTimeUTC(utc_Parts(1))
+        utc_DateTimeOut = ConvDateUTC2(utc_Parts(0)) + ConvTimeUTC2(utc_Parts(1))
         If Not OutputUTCDate Then
             ParseIso = ConvertToLocalDate(utc_DateTimeOut)
         Else
@@ -706,6 +706,29 @@ Private Function utc_SystemTimeToDate(ByRef utc_Value As utc_SYSTEMTIME) As Date
 End Function
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : ConvDateUTC2
+' Author    : Adam Waller
+' Date      : 11/14/2023
+' Purpose   : Attempt a higher performance conversion first, then fall back to RegEx.
+'---------------------------------------------------------------------------------------
+'
+Private Function ConvDateUTC2(ByVal InVal As String) As Date
+
+    Dim varParts As Variant
+
+    If InVal Like "####-##-##" Then
+        ' Use high-performance conversion to date
+        varParts = Split(InVal, "-")
+        ConvDateUTC2 = DateSerial(varParts(0), varParts(1), varParts(2))
+    Else
+        ' Fall back to slower RegEx function
+        ConvDateUTC2 = ConvDateUTC(InVal)
+    End If
+
+End Function
+
+
 Private Function ConvDateUTC(ByVal InVal As String) As Date
     Dim RetVal As Variant
 
@@ -753,6 +776,30 @@ Private Function ConvDateUTC(ByVal InVal As String) As Date
     ConvDateUTC = RetVal
 End Function
 
+
+'---------------------------------------------------------------------------------------
+' Procedure : ConvTimeUTC2
+' Author    : Adam Waller
+' Date      : 11/14/2023
+' Purpose   : Attempt a higher performance conversion first, then fall back to RegEx.
+'---------------------------------------------------------------------------------------
+'
+Private Function ConvTimeUTC2(ByVal InVal As String) As Date
+
+    Dim varParts As Variant
+
+    If InVal Like "##:##:##.###Z" Then
+        ' Use high-performance conversion to date
+        varParts = Split(InVal, ":")
+        ConvTimeUTC2 = TimeSerial(varParts(0), varParts(1), Left(varParts(2), 2))
+    Else
+        ' Fall back to slower RegEx function
+        ConvTimeUTC2 = ConvDateUTC(InVal)
+    End If
+
+End Function
+
+
 Private Function ConvTimeUTC(ByRef InVal As String) As Date
 
     Dim dblHours As Double

From aff7be99d8ced2622c2f09005d42b93abda6d5be Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:21:33 -0600
Subject: [PATCH 45/73] Fix copy-paste oversight

#354
---
 Version Control.accda.src/modules/modUtcConverter.bas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index 7d58a827..d8d403b0 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -794,7 +794,7 @@ Private Function ConvTimeUTC2(ByVal InVal As String) As Date
         ConvTimeUTC2 = TimeSerial(varParts(0), varParts(1), Left(varParts(2), 2))
     Else
         ' Fall back to slower RegEx function
-        ConvTimeUTC2 = ConvDateUTC(InVal)
+        ConvTimeUTC2 = ConvTimeUTC(InVal)
     End If
 
 End Function

From e18d8188cddff509bb24e971224a84fcb1970d5c Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:41:10 -0600
Subject: [PATCH 46/73] Update error handling

Refactored a number of locations to use the new syntax for On Error Resume Next, and added code to clear expected errors.
---
 Version Control.accda.src/forms/frmVCSMain.bas  |  3 ++-
 .../modules/clsDbModule.cls                     |  6 ++++--
 .../modules/clsDbRelation.cls                   |  4 +++-
 .../modules/clsDbSavedSpec.cls                  |  3 ++-
 .../modules/clsDbTableDef.cls                   |  6 ++++--
 .../modules/clsDbVbeProject.cls                 |  3 ++-
 .../modules/clsVCSIndex.cls                     |  3 ++-
 .../modules/clsViewDiff.cls                     |  6 ++++--
 .../modules/modComAddIn.bas                     |  4 +++-
 .../modules/modDatabase.bas                     | 17 ++++++++++++-----
 .../modules/modFileAccess.bas                   |  3 ++-
 .../modules/modFunctions.bas                    |  3 +++
 Version Control.accda.src/modules/modHash.bas   | 12 +++++++++---
 .../modules/modImportExport.bas                 |  3 ++-
 .../modules/modInstall.bas                      | 14 ++++++++++----
 .../modules/modOrphaned.bas                     |  3 +++
 .../modules/modUIAutomation.bas                 |  3 ++-
 .../modules/modVCSUtility.bas                   |  4 +++-
 .../modules/modVbeForm.bas                      |  1 +
 Version Control.accda.src/vcs-options.json      |  3 ++-
 20 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSMain.bas b/Version Control.accda.src/forms/frmVCSMain.bas
index de354f4c..bdfc5463 100644
--- a/Version Control.accda.src/forms/frmVCSMain.bas	
+++ b/Version Control.accda.src/forms/frmVCSMain.bas	
@@ -1965,7 +1965,8 @@ End Sub
 '
 Private Sub cmdClose_Click()
     ' Ignore the error if the user resumes (cancels the close operation)
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     DoCmd.Close acForm, Me.Name
     Catch 2501  ' Close form was canceled.
 End Sub
diff --git a/Version Control.accda.src/modules/clsDbModule.cls b/Version Control.accda.src/modules/clsDbModule.cls
index e342a840..d1b98c36 100644
--- a/Version Control.accda.src/modules/clsDbModule.cls	
+++ b/Version Control.accda.src/modules/clsDbModule.cls	
@@ -95,7 +95,8 @@ Private Sub IDbComponent_Import(strFile As String)
     DoCmd.Save acModule, strName
 
     ' Set reference to object
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     Set m_Module = CurrentProject.AllModules(strName)
     If Catch(2467) Then Log.Error eelCritical, _
         "Imported module not found after import: " & strName, ModuleName(Me) & ".Import"
@@ -205,7 +206,8 @@ Private Sub LoadVbeModuleFromFile(strFile As String, strName As String)
     With proj.VBComponents
 
         ' Remove any existing component (In most cases the module will exist)
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         .Remove .Item(strName)
         If DebugMode(False) Then On Error GoTo 0 Else On Error Resume Next
 
diff --git a/Version Control.accda.src/modules/clsDbRelation.cls b/Version Control.accda.src/modules/clsDbRelation.cls
index 4d8cd14e..1ecbf3d6 100644
--- a/Version Control.accda.src/modules/clsDbRelation.cls	
+++ b/Version Control.accda.src/modules/clsDbRelation.cls	
@@ -95,7 +95,8 @@ Private Sub IDbComponent_Import(strFile As String)
         ' Relationships create indexes, so we need to make sure an index
         ' with this name doesn't already exist. (Also check to be sure that
         ' we don't already have a relationship with this name.)
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         With m_Dbs
             .TableDefs(rel.Table).Indexes.Delete rel.Name
             .TableDefs(rel.ForeignTable).Indexes.Delete rel.Name
@@ -134,6 +135,7 @@ Private Sub IDbComponent_Merge(strFile As String)
         On Error Resume Next
         CurrentDb.Relations.Delete FSO.GetBaseName(strFile)
         VCSIndex.Remove Me, strFile
+        If Err Then Err.Clear
     End If
 End Sub
 
diff --git a/Version Control.accda.src/modules/clsDbSavedSpec.cls b/Version Control.accda.src/modules/clsDbSavedSpec.cls
index 713deb2f..745ad4ae 100644
--- a/Version Control.accda.src/modules/clsDbSavedSpec.cls	
+++ b/Version Control.accda.src/modules/clsDbSavedSpec.cls	
@@ -179,7 +179,8 @@ Private Function GetDictionary() As Dictionary
 
     Set dSpec = New Dictionary
 
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     ' For some reason it throws an error if there is no
     ' description in the specification.
     With dSpec
diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls
index c119bee4..963558e6 100644
--- a/Version Control.accda.src/modules/clsDbTableDef.cls	
+++ b/Version Control.accda.src/modules/clsDbTableDef.cls	
@@ -518,7 +518,8 @@ Private Function IndexAvailable(tdf As TableDef) As Boolean
 
     Dim lngTest As Long
 
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     lngTest = tdf.Indexes.Count
     If Err Then
         Err.Clear
@@ -547,7 +548,8 @@ Private Function ImportLinkedTable(strFile As String) As Boolean
     Dim strSql As String
     Dim strConnect As String
 
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     ' Read json file
     Set dTable = ReadJsonFile(strFile)
diff --git a/Version Control.accda.src/modules/clsDbVbeProject.cls b/Version Control.accda.src/modules/clsDbVbeProject.cls
index df196575..5c2730b4 100644
--- a/Version Control.accda.src/modules/clsDbVbeProject.cls	
+++ b/Version Control.accda.src/modules/clsDbVbeProject.cls	
@@ -108,7 +108,8 @@ Private Sub SafeSetProperty(cProj As VBProject, strProperty As String, varValue
     If varValue = varCurrent Then Exit Sub
 
     ' Switch to on error resume next after checking for current errors
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     ' Attempt to set the property
     CallByName cProj, strProperty, VbLet, varValue
diff --git a/Version Control.accda.src/modules/clsVCSIndex.cls b/Version Control.accda.src/modules/clsVCSIndex.cls
index 396e42e6..ccee4137 100644
--- a/Version Control.accda.src/modules/clsVCSIndex.cls	
+++ b/Version Control.accda.src/modules/clsVCSIndex.cls	
@@ -776,7 +776,8 @@ End Property
 Public Sub ClearTempExportFolder()
     If m_strTempExportFolderPath <> vbNullString Then
         If FSO.FolderExists(m_strTempExportFolderPath) Then
-            If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+            LogUnhandledErrors
+            On Error Resume Next
             ' Use FSO to delete the folder and contents
             FSO.DeleteFolder m_strTempExportFolderPath, True
             CatchAny eelWarning, "Unable to delete temp folder: '" & m_strTempExportFolderPath & _
diff --git a/Version Control.accda.src/modules/clsViewDiff.cls b/Version Control.accda.src/modules/clsViewDiff.cls
index 72579031..1d863e02 100644
--- a/Version Control.accda.src/modules/clsViewDiff.cls	
+++ b/Version Control.accda.src/modules/clsViewDiff.cls	
@@ -140,7 +140,8 @@ Public Sub ClearTempFiles()
     Dim varFile As Variant
 
     If Not m_colTempFiles Is Nothing Then
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         For Each varFile In m_colTempFiles
             If FSO.FileExists(varFile) Then DeleteFile CStr(varFile)
         Next varFile
@@ -185,7 +186,8 @@ Private Sub RunCompare(strFile1 As String, strFile2 As String)
     End Select
 
     ' Run command to launch compare
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     If strCmd <> vbNullString Then
         With New WshShell
             .Run strCmd
diff --git a/Version Control.accda.src/modules/modComAddIn.bas b/Version Control.accda.src/modules/modComAddIn.bas
index f1ff74c5..0c801f7d 100644
--- a/Version Control.accda.src/modules/modComAddIn.bas	
+++ b/Version Control.accda.src/modules/modComAddIn.bas	
@@ -306,7 +306,8 @@ Private Function DllIsRegistered() As Boolean
     ' Check HKLM registry key
     With New IWshRuntimeLibrary.WshShell
         ' We should have a value here if the install ran in the past.
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         ' Look up the class ID from the COM registration
         strTest = .RegRead("HKCU\SOFTWARE\Classes\MSAccessVCSLib.AddInRibbon\CLSID\")
         If strTest <> vbNullString Then
@@ -318,6 +319,7 @@ Private Function DllIsRegistered() As Boolean
                 DllIsRegistered = FSO.FileExists(strTest)
             End If
         End If
+        If Err Then Err.Clear
     End With
 
 End Function
diff --git a/Version Control.accda.src/modules/modDatabase.bas b/Version Control.accda.src/modules/modDatabase.bas
index 35e10d5d..89ed41c7 100644
--- a/Version Control.accda.src/modules/modDatabase.bas	
+++ b/Version Control.accda.src/modules/modDatabase.bas	
@@ -392,9 +392,11 @@ Public Function ObjectExists(intType As AcObjectType, strName As String, Optiona
         Log.Error eelError, "Parent container not supported for this object type: " & intType, ModuleName & ".ObjectExists"
     Else
         ' Attempt to reference the object by name
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         Set objTest = objContainer(strName)
         ObjectExists = Not Catch(2467)
+        If Err Then Err.Clear
     End If
 
 End Function
@@ -573,7 +575,8 @@ Public Function DatabaseFileOpen() As Boolean
     Else
         ' For ADP projects, CurrentProject may be an invalid object reference
         ' after the database file (adp) is closed.
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         strTest = CurrentProject.FullName
         CatchAny eelNoError, vbNullString
         DatabaseFileOpen = (strTest <> vbNullString)
@@ -637,7 +640,8 @@ Public Function DeleteObjectIfExists(intType As AcObjectType, strName As String)
     End Select
 
     ' Trap errors when attempting to delete the object
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     If Not blnExistsInAddIn Then
         ' Nice! We can use a simple call to delete the object
@@ -718,10 +722,12 @@ Public Function FormLoaded(frmMe As Form) As Boolean
     ' If no forms are open, we already have our answer.  :-)
     If Forms.Count > 0 Then
         ' We will throw an error accessing the name property if the form is closed
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         strName = frmMe.Name
         ' Return true if we were able to read the name property
         FormLoaded = strName <> vbNullString
+        If Err Then Err.Clear
     End If
 End Function
 
@@ -747,7 +753,8 @@ Public Function VerifyFocus(ctlWithFocus As Control) As Boolean
     Set frmParent = objParent
 
     ' Ignore any errors with Screen.* functions
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     ' Verify focus of parent form
     Set frmParent = Screen.ActiveForm
diff --git a/Version Control.accda.src/modules/modFileAccess.bas b/Version Control.accda.src/modules/modFileAccess.bas
index a6c68029..754edcd7 100644
--- a/Version Control.accda.src/modules/modFileAccess.bas	
+++ b/Version Control.accda.src/modules/modFileAccess.bas	
@@ -138,7 +138,8 @@ Public Sub WriteFile(strText As String, strPath As String, Optional strEncoding
         ' Write to disk
         VerifyPath strPath
         ' Watch out for possible write error
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         .SaveToFile strPath, adSaveCreateOverWrite
         If Catch(3004) Then
             ' File is locked. Try again after 1 second, just in case something
diff --git a/Version Control.accda.src/modules/modFunctions.bas b/Version Control.accda.src/modules/modFunctions.bas
index a19e3e4a..12bcaeb0 100644
--- a/Version Control.accda.src/modules/modFunctions.bas	
+++ b/Version Control.accda.src/modules/modFunctions.bas	
@@ -789,6 +789,9 @@ Public Function IsEmptyArray(varArray As Variant) As Boolean
     lngLowBound = clngTest
     lngLowBound = LBound(varArray)
 
+    ' Clear any error thrown while attempting to read LBound()
+    If Err Then Err.Clear
+
     ' If the above assignment fails, we have an empty array
     IsEmptyArray = (lngLowBound = clngTest)
 
diff --git a/Version Control.accda.src/modules/modHash.bas b/Version Control.accda.src/modules/modHash.bas
index 6045bc0f..56d2071e 100644
--- a/Version Control.accda.src/modules/modHash.bas	
+++ b/Version Control.accda.src/modules/modHash.bas	
@@ -132,14 +132,16 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Private Function HashBytes(Data() As Byte, Optional HashingAlgorithm As String = DefaultHashAlgorithm) As Byte()
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     HashBytes = NGHash(VarPtr(Data(LBound(Data))), UBound(Data) - LBound(Data) + 1, HashingAlgorithm)
     If Catch(9) Then HashBytes = NGHash(VarPtr(Null), UBound(Data) - LBound(Data) + 1, HashingAlgorithm)
     CatchAny eelCritical, "Error hashing data!", ModuleName & ".HashBytes", True, True
 End Function
 
 Private Function HashString(str As String, Optional HashingAlgorithm As String = DefaultHashAlgorithm) As Byte()
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     HashString = NGHash(StrPtr(str), Len(str) * 2, HashingAlgorithm)
     If Catch(9) Then HashString = NGHash(StrPtr(vbNullString), Len(str) * 2, HashingAlgorithm)
     CatchAny eelCritical, "Error hashing string!", ModuleName & ".HashString", True, True
@@ -274,7 +276,8 @@ Public Function GetCodeModuleHash(intType As eDatabaseComponentType, strName As
         Set proj = CurrentVBProject
 
         ' Attempt to locate the object in the VBComponents collection
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         Set cmpItem = proj.VBComponents(strPrefix & strName)
         Catch 9 ' Component not found. (Could be an object with no code module)
         CatchAny eelError, "Error accessing VBComponent for '" & strPrefix & strName & "'", ModuleName & ".GetCodeModuleHash"
@@ -383,4 +386,7 @@ Public Function GetSimpleHash(strText As String) As String
     ' Return short hash
     GetSimpleHash = Left(strHash, 7)
 
+    ' Clear any errors
+    If Err Then Err.Clear
+
 End Function
diff --git a/Version Control.accda.src/modules/modImportExport.bas b/Version Control.accda.src/modules/modImportExport.bas
index 4e9b0270..f3eb1a4f 100644
--- a/Version Control.accda.src/modules/modImportExport.bas	
+++ b/Version Control.accda.src/modules/modImportExport.bas	
@@ -1489,7 +1489,8 @@ Public Sub InitializeForms(cContainers As Dictionary)
     Dim varKey As Variant
 
     ' Trap any errors that may occur when opening forms
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     ' See if we imported any forms
     For Each cont In cContainers
diff --git a/Version Control.accda.src/modules/modInstall.bas b/Version Control.accda.src/modules/modInstall.bas
index 8945635f..31253764 100644
--- a/Version Control.accda.src/modules/modInstall.bas	
+++ b/Version Control.accda.src/modules/modInstall.bas	
@@ -439,7 +439,8 @@ Private Sub RemoveMenuItem(ByVal strName As String, Optional Hive As eHive = ehH
     strPath = GetAddinRegPath(Hive) & strName & "\"
     With New IWshRuntimeLibrary.WshShell
         ' Just in case someone changed some of the keys...
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         .RegDelete strPath & "Expression"
         .RegDelete strPath & "Library"
         .RegDelete strPath & "Version"
@@ -552,7 +553,8 @@ Private Sub RunUpgrades()
         ' Check for installation in HKLM hive.
         strOldPath = GetAddinRegPath(ehHKLM) & "&Version Control\Library"
         Set objShell = New IWshRuntimeLibrary.WshShell
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         strTest = objShell.RegRead(strOldPath)
         If Err Then Err.Clear
         On Error GoTo 0
@@ -634,7 +636,8 @@ End Sub
 Public Function HasLegacyRC4Keys()
     Dim strValue As String
     With New IWshRuntimeLibrary.WshShell
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         strValue = .RegRead("HKCU\SOFTWARE\VB and VBA Program Settings\MSAccessVCS\Private Keys\")
         HasLegacyRC4Keys = Not Catch(-2147024894)
         CatchAny eelError, "Checking for legacy RC4 keys", ModuleName & ".HasLegacyRC4Keys"
@@ -797,7 +800,8 @@ Public Sub RemoveTrustedLocation(Optional strName As String)
     strPath = GetTrustedLocationRegPath(strName)
 
     With New IWshRuntimeLibrary.WshShell
-        If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+        LogUnhandledErrors
+        On Error Resume Next
         .RegDelete strPath & "Path"
         .RegDelete strPath & "Date"
         .RegDelete strPath & "Description"
@@ -998,6 +1002,8 @@ Private Function CheckRegKey(strPath As String, ParamArray AllowedValues() As Va
         End If
     Next intCnt
 
+    If Err Then Err.Clear
+
 End Function
 
 
diff --git a/Version Control.accda.src/modules/modOrphaned.bas b/Version Control.accda.src/modules/modOrphaned.bas
index cbad9677..5b04f387 100644
--- a/Version Control.accda.src/modules/modOrphaned.bas	
+++ b/Version Control.accda.src/modules/modOrphaned.bas	
@@ -279,4 +279,7 @@ Public Sub RemoveOrphanedDatabaseObjects(cCategory As IDbComponent)
         End If
     Next varKey
 
+    ' Handle any uncaught errors
+    CatchAny eelError, "Error removing orphaned objects.", ModuleName & ".RemoveOrphanedDatabaseObjects"
+
 End Sub
diff --git a/Version Control.accda.src/modules/modUIAutomation.bas b/Version Control.accda.src/modules/modUIAutomation.bas
index 6c5990ef..7b07c492 100644
--- a/Version Control.accda.src/modules/modUIAutomation.bas	
+++ b/Version Control.accda.src/modules/modUIAutomation.bas	
@@ -73,7 +73,8 @@ Private Function GetUnderlyingDbObjectFromButton(oClient As CUIAutomation, oElem
     strImage = GetImageName(oClient, oElement)
 
     ' Just in case something doesn't work right...
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
 
     ' There are multiple icons for some objects
     If LikeAny(strImage, "Table*", "*Tabelle") Then
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 21bf7f7d..8a296512 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -923,8 +923,10 @@ End Function
 Public Sub LoadVCSAddIn()
     ' The following lines will load the add-in at the application level,
     ' but will not actually call the function. Ignore the error of function not found.
-    If DebugMode(True) Then On Error Resume Next Else On Error Resume Next
+    LogUnhandledErrors
+    On Error Resume Next
     Application.Run GetAddInFileName & "!DummyFunction"
+    If Err Then Err.Clear
 End Sub
 
 
diff --git a/Version Control.accda.src/modules/modVbeForm.bas b/Version Control.accda.src/modules/modVbeForm.bas
index 44e53636..fbba0dd9 100644
--- a/Version Control.accda.src/modules/modVbeForm.bas	
+++ b/Version Control.accda.src/modules/modVbeForm.bas	
@@ -144,6 +144,7 @@ Private Sub AddProperty(dic As Dictionary, o As Object, strName As Variant)
             ' Use CallByName on object to get value if the property exists
             On Error Resume Next
             dic.Add strName, CallByName(o, strName, VbGet)
+            If Err Then Err.Clear
     End Select
 End Sub
 
diff --git a/Version Control.accda.src/vcs-options.json b/Version Control.accda.src/vcs-options.json
index 7e3f5716..673e5d5c 100644
--- a/Version Control.accda.src/vcs-options.json	
+++ b/Version Control.accda.src/vcs-options.json	
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.22",
+    "AddinVersion": "4.0.26",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {
@@ -36,6 +36,7 @@
     "FormatSQL": true,
     "ForceImportOriginalQuerySQL": false,
     "SaveTableSQL": true,
+    "SplitLayoutFromVBA": false,
     "StripPublishOption": true,
     "SanitizeColors": 3,
     "SanitizeLevel": 2,

From b7985e9f61496aa199d5a8b9c6e74d0649ab0721 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:42:19 -0600
Subject: [PATCH 47/73] Use faster date parsing for date only values

---
 Version Control.accda.src/modules/modUtcConverter.bas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index d8d403b0..a632f023 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -473,7 +473,7 @@ Public Function ParseIso(utc_IsoString As String _
             ParseIso = utc_DateTimeOut
         End If
     Else ' Assume any "Date Only" Text doesn't have a timezone (they aren't converted the other way, either)
-        ParseIso = ConvDateUTC(utc_Parts(0))
+        ParseIso = ConvDateUTC2(utc_Parts(0))
     End If
     Exit Function
 #End If

From fe35d3bd4b75300e72e1a6b23c83ddac6bf2888d Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:44:30 -0600
Subject: [PATCH 48/73] Add Split Files utility to ribbon (Advanced Tools)

Also added an informational message box when the split is complete.
---
 Ribbon/Ribbon.xml                                    |  3 ++-
 Version Control.accda.src/forms/frmVCSSplitFiles.bas |  9 +++++++++
 .../modules/clsVersionControl.cls                    | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Ribbon/Ribbon.xml b/Ribbon/Ribbon.xml
index 1738fb3b..607abca0 100644
--- a/Ribbon/Ribbon.xml
+++ b/Ribbon/Ribbon.xml
@@ -14,7 +14,7 @@
           <button id="btnExportSelected" size="large" label="Export Selected" supertip="Export the database component currently selected in the navigation pane." imageMso="SelectionPane" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <separator id="sep2" getVisible="GetVisible" />
           <button id="btnBuild" size="large" label="Build From Source" supertip="Build the current project from source files." imageMso="FileCompactAndRepairDatabase" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
-          <button id="btnMergeBuild" size="large" label="Merge Build" supertip="Merge changed source files into the current database." imageMso="AdpDiagramArrangeTables" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
+          <button id="btnMergeBuild" size="large" label="Merge Build" supertip="Merge changed source files into the current database." imageMso="CellsInsertDialog" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <button id="btnBuildAs" size="large" label="Build As․․․" supertip="Build from source files to a new name or location." imageMso="FileSaveAs" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <button id="btnLoadSelected" size="large" label="Load Selected" supertip="Import from source files the database component currently selected in the navigation pane." imageMso="AlignDialog" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
         </group>
@@ -29,6 +29,7 @@
             <button id="btnGoToLinkAdvancedTools" label="View Documentation" description="See documentation on the purpose and usage of these custom tools..." imageMso="TentativeAcceptInvitation" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnLocalizeLibraryReferences" label="Localize Library References" description="Relink add-in library databases to the files located in the same folder as the current database" imageMso="MacroShowAllActions" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnRepairColors" label="Repair Colors" description="Rebuild color definition blocks in form objects (See documentation for more info)" supertip="test2" imageMso="SmartArtChangeColorsGallery" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
+            <button id="btnSplitFiles" label="Split Files" description="Duplicate files while preserving Git line history" imageMso="AdpDiagramArrangeTables" tag="RibbonName:=;inMenu:=mnuAdvancedTools;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnActivateHook" label="Activate Hook" description="Enable Access Application hook to report saving of objects and enabling automatic export on save." supertip="Activate Hook" imageMso="Call" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnReloadRibbon" label="Reload Ribbon" description="Refresh the add-in ribbon menu to reflect changes in XML source" imageMso="DataRefreshAll" tag="RibbonName:=;inMenu:=mnuAdvancedTools;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           </menu>
diff --git a/Version Control.accda.src/forms/frmVCSSplitFiles.bas b/Version Control.accda.src/forms/frmVCSSplitFiles.bas
index a73b3411..892aab52 100644
--- a/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
+++ b/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
@@ -1040,7 +1040,16 @@ Private Sub cmdSplitFiles_Click()
             MsgBox2 "Validation Failed", strError, "Please correct the problem to continue.", vbExclamation
         Else
             ' Split the files using git commands
+            DoCmd.Hourglass True
             Git.SplitFilesWithHistory strPaths, strNew, txtCommitMessage
+            DoCmd.Hourglass False
+
+            ' Show success message
+            MsgBox2 "Finished", "The operation is complete.", _
+                "For additional details, please see `git.log` in the source folder.", vbInformation
+
+            ' Clear existing list
+            txtFileList = vbNullString
         End If
 
         ' Restore original working folder
diff --git a/Version Control.accda.src/modules/clsVersionControl.cls b/Version Control.accda.src/modules/clsVersionControl.cls
index e0913d46..bf0743a4 100644
--- a/Version Control.accda.src/modules/clsVersionControl.cls	
+++ b/Version Control.accda.src/modules/clsVersionControl.cls	
@@ -373,6 +373,18 @@ Public Sub RepairColors()
 End Sub
 
 
+'---------------------------------------------------------------------------------------
+' Procedure : SplitFiles
+' Author    : Adam Waller
+' Date      : 11/14/2023
+' Purpose   :
+'---------------------------------------------------------------------------------------
+'
+Public Sub SplitFiles()
+    DoCmd.OpenForm "frmVCSSplitFiles"
+End Sub
+
+
 '---------------------------------------------------------------------------------------
 ' Procedure : LocalizeLibraryReferences
 ' Author    : Adam Waller

From c28f32b4e930262ae4b6dcb4d6e69281311308bc Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 09:21:59 -0600
Subject: [PATCH 49/73] Rename as new files

---
 Testing/Testing.accdb.src/forms/{frmColors.bas => frmColors.cls}  | 0
 .../forms/{frmExtendedChars.bas => frmExtendedChars.cls}          | 0
 Testing/Testing.accdb.src/forms/{frmMain.bas => frmMain.cls}      | 0
 .../reports/{rptDefaultPrinter.bas => rptDefaultPrinter.cls}      | 0
 .../{rptNavigationPaneGroups.bas => rptNavigationPaneGroups.cls}  | 0
 .../{rptNonDefaultPaperSize.bas => rptNonDefaultPaperSize.cls}    | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename Testing/Testing.accdb.src/forms/{frmColors.bas => frmColors.cls} (100%)
 rename Testing/Testing.accdb.src/forms/{frmExtendedChars.bas => frmExtendedChars.cls} (100%)
 rename Testing/Testing.accdb.src/forms/{frmMain.bas => frmMain.cls} (100%)
 rename Testing/Testing.accdb.src/reports/{rptDefaultPrinter.bas => rptDefaultPrinter.cls} (100%)
 rename Testing/Testing.accdb.src/reports/{rptNavigationPaneGroups.bas => rptNavigationPaneGroups.cls} (100%)
 rename Testing/Testing.accdb.src/reports/{rptNonDefaultPaperSize.bas => rptNonDefaultPaperSize.cls} (100%)

diff --git a/Testing/Testing.accdb.src/forms/frmColors.bas b/Testing/Testing.accdb.src/forms/frmColors.cls
similarity index 100%
rename from Testing/Testing.accdb.src/forms/frmColors.bas
rename to Testing/Testing.accdb.src/forms/frmColors.cls
diff --git a/Testing/Testing.accdb.src/forms/frmExtendedChars.bas b/Testing/Testing.accdb.src/forms/frmExtendedChars.cls
similarity index 100%
rename from Testing/Testing.accdb.src/forms/frmExtendedChars.bas
rename to Testing/Testing.accdb.src/forms/frmExtendedChars.cls
diff --git a/Testing/Testing.accdb.src/forms/frmMain.bas b/Testing/Testing.accdb.src/forms/frmMain.cls
similarity index 100%
rename from Testing/Testing.accdb.src/forms/frmMain.bas
rename to Testing/Testing.accdb.src/forms/frmMain.cls
diff --git a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls
similarity index 100%
rename from Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
rename to Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls
diff --git a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls
similarity index 100%
rename from Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
rename to Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls
diff --git a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls
similarity index 100%
rename from Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
rename to Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls

From bc235135abfcc38f6f451306c9105a0c9de97c7f Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 09:22:04 -0600
Subject: [PATCH 50/73] Restore original files

---
 Testing/Testing.accdb.src/forms/frmColors.bas | 944 ++++++++++++++++++
 .../forms/frmExtendedChars.bas                | 625 ++++++++++++
 Testing/Testing.accdb.src/forms/frmMain.bas   | 624 ++++++++++++
 .../reports/rptDefaultPrinter.bas             |  99 ++
 .../reports/rptNavigationPaneGroups.bas       | 286 ++++++
 .../reports/rptNonDefaultPaperSize.bas        |  98 ++
 6 files changed, 2676 insertions(+)
 create mode 100644 Testing/Testing.accdb.src/forms/frmColors.bas
 create mode 100644 Testing/Testing.accdb.src/forms/frmExtendedChars.bas
 create mode 100644 Testing/Testing.accdb.src/forms/frmMain.bas
 create mode 100644 Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
 create mode 100644 Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
 create mode 100644 Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas

diff --git a/Testing/Testing.accdb.src/forms/frmColors.bas b/Testing/Testing.accdb.src/forms/frmColors.bas
new file mode 100644
index 00000000..0452bc76
--- /dev/null
+++ b/Testing/Testing.accdb.src/forms/frmColors.bas
@@ -0,0 +1,944 @@
+Version =20
+VersionRequired =20
+Begin Form
+    RecordSelectors = NotDefault
+    NavigationButtons = NotDefault
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    DefaultView =0
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =14400
+    DatasheetFontHeight =11
+    ItemSuffix =50
+    Right =19650
+    Bottom =12585
+    RecSrcDt = Begin
+        0x8b5c5de351a8e540
+    End
+    DatasheetFontName ="Franklin Gothic Book"
+    AllowDatasheetView =0
+    FilterOnLoad =0
+    ShowPageMargins =0
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Rectangle
+            SpecialEffect =3
+            BackStyle =0
+            BorderLineStyle =0
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Line
+            BorderLineStyle =0
+            BorderThemeColorIndex =0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Image
+            BackStyle =0
+            OldBorderStyle =0
+            BorderLineStyle =0
+            SizeMode =3
+            PictureAlignment =2
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin CommandButton
+            FontSize =11
+            FontWeight =400
+            FontName ="Calibri"
+            ForeThemeColorIndex =0
+            ForeTint =75.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+            UseTheme =1
+            Shape =1
+            Gradient =12
+            BackThemeColorIndex =4
+            BackTint =60.0
+            BorderLineStyle =0
+            BorderThemeColorIndex =4
+            BorderTint =60.0
+            ThemeFontIndex =1
+            HoverThemeColorIndex =4
+            HoverTint =40.0
+            PressedThemeColorIndex =4
+            PressedShade =75.0
+            HoverForeThemeColorIndex =0
+            HoverForeTint =75.0
+            PressedForeThemeColorIndex =0
+            PressedForeTint =75.0
+        End
+        Begin TextBox
+            AddColon = NotDefault
+            FELineBreak = NotDefault
+            BorderLineStyle =0
+            LabelX =-1800
+            FontSize =11
+            FontName ="Calibri"
+            AsianLineBreak =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            ThemeFontIndex =1
+            ForeThemeColorIndex =0
+            ForeTint =75.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin UnboundObjectFrame
+            SpecialEffect =2
+            OldBorderStyle =1
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            ForeThemeColorIndex =2
+            ForeShade =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin FormHeader
+            Height =780
+            Name ="FormHeader"
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =2
+            BackTint =20.0
+        End
+        Begin Section
+            Height =7050
+            Name ="Detail"
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =2880
+                    Top =1620
+                    Width =840
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label0"
+                    Caption ="Type"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =2880
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =3720
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Line
+                    OverlapFlags =85
+                    Left =480
+                    Top =2100
+                    Width =12540
+                    Name ="Line1"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =480
+                    LayoutCachedTop =2100
+                    LayoutCachedWidth =13020
+                    LayoutCachedHeight =2100
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =4320
+                    Top =1620
+                    Width =1260
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label3"
+                    Caption ="Theme Color"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =4320
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =5580
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =93
+                    TextFontFamily =0
+                    Left =7200
+                    Top =1620
+                    Width =1440
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label4"
+                    Caption ="Pallet Color"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =7200
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =8640
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =93
+                    TextFontFamily =0
+                    Left =10080
+                    Top =1620
+                    Width =1305
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label5"
+                    Caption ="Default Color"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =10080
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =11385
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =2880
+                    Top =2280
+                    Width =870
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label6"
+                    Caption ="Text Box"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =2880
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =3750
+                    LayoutCachedHeight =2640
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =2880
+                    Top =2820
+                    Width =870
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label7"
+                    Caption ="Label"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =2880
+                    LayoutCachedTop =2820
+                    LayoutCachedWidth =3750
+                    LayoutCachedHeight =3180
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =2880
+                    Top =3300
+                    Width =870
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label8"
+                    Caption ="Button"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =2880
+                    LayoutCachedTop =3300
+                    LayoutCachedWidth =3750
+                    LayoutCachedHeight =3660
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =2880
+                    Top =3780
+                    Width =870
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label9"
+                    Caption ="Box"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =2880
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =3750
+                    LayoutCachedHeight =4140
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =600
+                    Top =2280
+                    Width =1635
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label12"
+                    Caption ="Orange, Accent 2"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =600
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =2235
+                    LayoutCachedHeight =2640
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =4320
+                    Top =2280
+                    Width =1200
+                    Height =315
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text13"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =4320
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =5520
+                    LayoutCachedHeight =2595
+                    BackThemeColorIndex =5
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =7200
+                    Top =2280
+                    Width =1200
+                    Height =315
+                    TabIndex =1
+                    BackColor =5676533
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text15"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =7200
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =8400
+                    LayoutCachedHeight =2595
+                    BackThemeColorIndex =-1
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =8640
+                    Top =2280
+                    Width =1200
+                    Height =315
+                    TabIndex =2
+                    BackColor =3439082
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text16"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =8640
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =9840
+                    LayoutCachedHeight =2595
+                    BackThemeColorIndex =-1
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =11520
+                    Top =2280
+                    Width =1200
+                    Height =315
+                    TabIndex =3
+                    BackColor =-2147483598
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text18"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =11520
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =12720
+                    LayoutCachedHeight =2595
+                    BackThemeColorIndex =-1
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =11520
+                    Top =1620
+                    Width =1305
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label19"
+                    Caption ="System Color"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =11520
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =12825
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    OverlapFlags =87
+                    TextFontFamily =0
+                    Left =8640
+                    Top =1620
+                    Width =1440
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label20"
+                    Caption ="Custom Color"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =8640
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =10080
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    BackStyle =1
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =4320
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label21"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =4320
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =5520
+                    LayoutCachedHeight =3060
+                    BackThemeColorIndex =5
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =10080
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label22"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =10080
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =11280
+                    LayoutCachedHeight =3060
+                End
+                Begin Label
+                    BackStyle =1
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =7200
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BackColor =5676533
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label23"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =7200
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =8400
+                    LayoutCachedHeight =3060
+                    BackThemeColorIndex =-1
+                End
+                Begin Label
+                    BackStyle =1
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =8640
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BackColor =3439082
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label24"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =8640
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =9840
+                    LayoutCachedHeight =3060
+                    BackThemeColorIndex =-1
+                End
+                Begin Label
+                    BackStyle =1
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =11520
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BackColor =-2147483598
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label25"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =11520
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =12720
+                    LayoutCachedHeight =3060
+                    BackThemeColorIndex =-1
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =10080
+                    Top =2280
+                    Width =1260
+                    Height =315
+                    TabIndex =4
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text28"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =10080
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =11340
+                    LayoutCachedHeight =2595
+                End
+                Begin TextBox
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =5760
+                    Top =2280
+                    Width =1200
+                    Height =315
+                    TabIndex =5
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text30"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =5760
+                    LayoutCachedTop =2280
+                    LayoutCachedWidth =6960
+                    LayoutCachedHeight =2595
+                    BackThemeColorIndex =5
+                    BackTint =60.0
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =5760
+                    Top =1620
+                    Width =1260
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label31"
+                    Caption ="Shade"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =5760
+                    LayoutCachedTop =1620
+                    LayoutCachedWidth =7020
+                    LayoutCachedHeight =1980
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Label
+                    BackStyle =1
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =5760
+                    Top =2760
+                    Width =1200
+                    Height =300
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label32"
+                    Caption =" "
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =5760
+                    LayoutCachedTop =2760
+                    LayoutCachedWidth =6960
+                    LayoutCachedHeight =3060
+                    BackThemeColorIndex =5
+                    BackTint =60.0
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =4320
+                    Top =3240
+                    Width =1200
+                    TabIndex =6
+                    ForeColor =4210752
+                    Name ="Command33"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =4320
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =5520
+                    LayoutCachedHeight =3600
+                    Gradient =0
+                    BackThemeColorIndex =5
+                    BackTint =100.0
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =5760
+                    Top =3240
+                    Width =1200
+                    TabIndex =7
+                    ForeColor =4210752
+                    Name ="Command34"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =5760
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =6960
+                    LayoutCachedHeight =3600
+                    Gradient =0
+                    BackThemeColorIndex =5
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =7200
+                    Top =3240
+                    Width =1200
+                    TabIndex =8
+                    ForeColor =4210752
+                    Name ="Command35"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =7200
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =8400
+                    LayoutCachedHeight =3600
+                    Gradient =0
+                    BackColor =5676533
+                    BackThemeColorIndex =-1
+                    BackTint =100.0
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =8640
+                    Top =3240
+                    Width =1200
+                    TabIndex =9
+                    ForeColor =4210752
+                    Name ="Command36"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =8640
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =9840
+                    LayoutCachedHeight =3600
+                    Gradient =0
+                    BackColor =3439082
+                    BackThemeColorIndex =-1
+                    BackTint =100.0
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =10080
+                    Top =3240
+                    Width =1200
+                    TabIndex =10
+                    ForeColor =4210752
+                    Name ="Command37"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =10080
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =11280
+                    LayoutCachedHeight =3600
+                    BackColor =11710639
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =11520
+                    Top =3240
+                    Width =1200
+                    TabIndex =11
+                    ForeColor =4210752
+                    Name ="Command38"
+                    Caption ="Command33"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =11520
+                    LayoutCachedTop =3240
+                    LayoutCachedWidth =12720
+                    LayoutCachedHeight =3600
+                    Gradient =0
+                    BackColor =-2147483598
+                    BackThemeColorIndex =-1
+                    BackTint =100.0
+                    BorderColor =11710639
+                    HoverColor =13355721
+                    PressedColor =6249563
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                End
+                Begin Rectangle
+                    BackStyle =1
+                    OverlapFlags =85
+                    Left =4320
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BorderColor =10921638
+                    Name ="Box41"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =4320
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =5520
+                    LayoutCachedHeight =4140
+                    BackThemeColorIndex =5
+                End
+                Begin Rectangle
+                    BackStyle =1
+                    OverlapFlags =85
+                    Left =5760
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BorderColor =10921638
+                    Name ="Box42"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =5760
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =6960
+                    LayoutCachedHeight =4140
+                    BackThemeColorIndex =5
+                    BackTint =60.0
+                End
+                Begin Rectangle
+                    BackStyle =1
+                    OverlapFlags =85
+                    Left =7200
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BackColor =5676533
+                    BorderColor =10921638
+                    Name ="Box43"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =7200
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =8400
+                    LayoutCachedHeight =4140
+                    BackThemeColorIndex =-1
+                End
+                Begin Rectangle
+                    BackStyle =1
+                    OverlapFlags =85
+                    Left =8640
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BackColor =3439082
+                    BorderColor =10921638
+                    Name ="Box44"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =8640
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =9840
+                    LayoutCachedHeight =4140
+                    BackThemeColorIndex =-1
+                End
+                Begin Rectangle
+                    OverlapFlags =85
+                    Left =10080
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BorderColor =10921638
+                    Name ="Box45"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =10080
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =11280
+                    LayoutCachedHeight =4140
+                End
+                Begin Rectangle
+                    BackStyle =1
+                    OverlapFlags =85
+                    Left =11520
+                    Top =3780
+                    Width =1200
+                    Height =360
+                    BackColor =-2147483598
+                    BorderColor =10921638
+                    Name ="Box46"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =11520
+                    LayoutCachedTop =3780
+                    LayoutCachedWidth =12720
+                    LayoutCachedHeight =4140
+                    BackThemeColorIndex =-1
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =0
+                    Left =600
+                    Top =4860
+                    Width =1860
+                    Height =360
+                    BorderColor =8355711
+                    Name ="Label48"
+                    Caption ="Screenshot Image"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =600
+                    LayoutCachedTop =4860
+                    LayoutCachedWidth =2460
+                    LayoutCachedHeight =5220
+                    ForeThemeColorIndex =-1
+                    ForeTint =100.0
+                End
+                Begin Image
+                    PictureType =2
+                    Left =2760
+                    Top =4620
+                    Width =10245
+                    Height =2190
+                    BorderColor =10921638
+                    Name ="Image49"
+                    Picture ="Colors"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =2760
+                    LayoutCachedTop =4620
+                    LayoutCachedWidth =13005
+                    LayoutCachedHeight =6810
+                    TabIndex =12
+                End
+            End
+        End
+        Begin FormFooter
+            Height =660
+            Name ="FormFooter"
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit
diff --git a/Testing/Testing.accdb.src/forms/frmExtendedChars.bas b/Testing/Testing.accdb.src/forms/frmExtendedChars.bas
new file mode 100644
index 00000000..b366db29
--- /dev/null
+++ b/Testing/Testing.accdb.src/forms/frmExtendedChars.bas
@@ -0,0 +1,625 @@
+Version =20
+VersionRequired =20
+Begin Form
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    DefaultView =0
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =8884
+    DatasheetFontHeight =11
+    ItemSuffix =2
+    Right =25320
+    Bottom =14385
+    RecSrcDt = Begin
+        0xbd57868e6cf5e540
+    End
+    DatasheetFontName ="Franklin Gothic Book"
+    AllowDatasheetView =0
+    FilterOnLoad =0
+    ShowPageMargins =0
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Section
+            Height =7560
+            Name ="Detail"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin Label
+                    OverlapFlags =85
+                    Left =1080
+                    Top =1140
+                    Width =3420
+                    Height =600
+                    FontSize =18
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label0"
+                    Caption ="Extëndëd Cháráctërs"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =1080
+                    LayoutCachedTop =1140
+                    LayoutCachedWidth =4500
+                    LayoutCachedHeight =1740
+                End
+                Begin Label
+                    OverlapFlags =85
+                    Left =1080
+                    Top =2220
+                    Width =3420
+                    Height =600
+                    FontSize =18
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label1"
+                    Caption ="Unicode 👍 🚀 ☺"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =1080
+                    LayoutCachedTop =2220
+                    LayoutCachedWidth =4500
+                    LayoutCachedHeight =2820
+                End
+            End
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit
+
+
+'——————————————————————————————————————————————————————————————————————————————————————————¬
+' This module is used to prove that all ASCII characters survive the export\import cycle.  |
+'——————————————————————————————————————————————————————————————————————————————————————————+
+
+' ASCII Table Using Windows-1252 codepage
+'  Table generated using https://ozh.github.io/ascii-tables/
+'
+' +=====+=====+==========+=======+
+' | Dec | Hex |  Binary  | Char  |
+' +=====+=====+==========+=======+
+' |   0 | 00  | 00000000 | NUL   |
+' +-----+-----+----------+-------+
+' |   1 | 01  | 00000001 | SOH   |
+' +-----+-----+----------+-------+
+' |   2 | 02  | 00000010 | STX   |
+' +-----+-----+----------+-------+
+' |   3 | 03  | 00000011 | ETX   |
+' +-----+-----+----------+-------+
+' |   4 | 04  | 00000100 | EOT   |
+' +-----+-----+----------+-------+
+' |   5 | 05  | 00000101 | ENQ   |
+' +-----+-----+----------+-------+
+' |   6 | 06  | 00000110 | ACK   |
+' +-----+-----+----------+-------+
+' |   7 | 07  | 00000111 | BEL   |
+' +-----+-----+----------+-------+
+' |   8 | 08  | 00001000 | BS    |
+' +-----+-----+----------+-------+
+' |   9 | 09  | 00001001 | HT    |
+' +-----+-----+----------+-------+
+' |  10 | 0A  | 00001010 | LF    |
+' +-----+-----+----------+-------+
+' |  11 | 0B  | 00001011 | VT    |
+' +-----+-----+----------+-------+
+' |  12 | 0C  | 00001100 | FF    |
+' +-----+-----+----------+-------+
+' |  13 | 0D  | 00001101 | CR    |
+' +-----+-----+----------+-------+
+' |  14 | 0E  | 00001110 | SO    |
+' +-----+-----+----------+-------+
+' |  15 | 0F  | 00001111 | SI    |
+' +-----+-----+----------+-------+
+' |  16 | 10  | 00010000 | DLE   |
+' +-----+-----+----------+-------+
+' |  17 | 11  | 00010001 | DC1   |
+' +-----+-----+----------+-------+
+' |  18 | 12  | 00010010 | DC2   |
+' +-----+-----+----------+-------+
+' |  19 | 13  | 00010011 | DC3   |
+' +-----+-----+----------+-------+
+' |  20 | 14  | 00010100 | DC4   |
+' +-----+-----+----------+-------+
+' |  21 | 15  | 00010101 | NAK   |
+' +-----+-----+----------+-------+
+' |  22 | 16  | 00010110 | SYN   |
+' +-----+-----+----------+-------+
+' |  23 | 17  | 00010111 | ETB   |
+' +-----+-----+----------+-------+
+' |  24 | 18  | 00011000 | CAN   |
+' +-----+-----+----------+-------+
+' |  25 | 19  | 00011001 | EM    |
+' +-----+-----+----------+-------+
+' |  26 | 1A  | 00011010 | SUB   |
+' +-----+-----+----------+-------+
+' |  27 | 1B  | 00011011 | ESC   |
+' +-----+-----+----------+-------+
+' |  28 | 1C  | 00011100 | FS    |
+' +-----+-----+----------+-------+
+' |  29 | 1D  | 00011101 | GS    |
+' +-----+-----+----------+-------+
+' |  30 | 1E  | 00011110 | RS    |
+' +-----+-----+----------+-------+
+' |  31 | 1F  | 00011111 | US    |
+' +-----+-----+----------+-------+
+' |  32 | 20  | 00100000 | space |
+' +-----+-----+----------+-------+
+' |  33 | 21  | 00100001 | !     |
+' +-----+-----+----------+-------+
+' |  34 | 22  | 00100010 | "     |
+' +-----+-----+----------+-------+
+' |  35 | 23  | 00100011 | #     |
+' +-----+-----+----------+-------+
+' |  36 | 24  | 00100100 | $     |
+' +-----+-----+----------+-------+
+' |  37 | 25  | 00100101 | %     |
+' +-----+-----+----------+-------+
+' |  38 | 26  | 00100110 | &     |
+' +-----+-----+----------+-------+
+' |  39 | 27  | 00100111 | '     |
+' +-----+-----+----------+-------+
+' |  40 | 28  | 00101000 | (     |
+' +-----+-----+----------+-------+
+' |  41 | 29  | 00101001 | )     |
+' +-----+-----+----------+-------+
+' |  42 | 2A  | 00101010 | *     |
+' +-----+-----+----------+-------+
+' |  43 | 2B  | 00101011 | +     |
+' +-----+-----+----------+-------+
+' |  44 | 2C  | 00101100 | ,     |
+' +-----+-----+----------+-------+
+' |  45 | 2D  | 00101101 | -     |
+' +-----+-----+----------+-------+
+' |  46 | 2E  | 00101110 | .     |
+' +-----+-----+----------+-------+
+' |  47 | 2F  | 00101111 | /     |
+' +-----+-----+----------+-------+
+' |  48 | 30  | 00110000 | 0     |
+' +-----+-----+----------+-------+
+' |  49 | 31  | 00110001 | 1     |
+' +-----+-----+----------+-------+
+' |  50 | 32  | 00110010 | 2     |
+' +-----+-----+----------+-------+
+' |  51 | 33  | 00110011 | 3     |
+' +-----+-----+----------+-------+
+' |  52 | 34  | 00110100 | 4     |
+' +-----+-----+----------+-------+
+' |  53 | 35  | 00110101 | 5     |
+' +-----+-----+----------+-------+
+' |  54 | 36  | 00110110 | 6     |
+' +-----+-----+----------+-------+
+' |  55 | 37  | 00110111 | 7     |
+' +-----+-----+----------+-------+
+' |  56 | 38  | 00111000 | 8     |
+' +-----+-----+----------+-------+
+' |  57 | 39  | 00111001 | 9     |
+' +-----+-----+----------+-------+
+' |  58 | 3A  | 00111010 | :     |
+' +-----+-----+----------+-------+
+' |  59 | 3B  | 00111011 | ;     |
+' +-----+-----+----------+-------+
+' |  60 | 3C  | 00111100 | <     |
+' +-----+-----+----------+-------+
+' |  61 | 3D  | 00111101 | =     |
+' +-----+-----+----------+-------+
+' |  62 | 3E  | 00111110 | >     |
+' +-----+-----+----------+-------+
+' |  63 | 3F  | 00111111 | ?     |
+' +-----+-----+----------+-------+
+' |  64 | 40  | 01000000 | @     |
+' +-----+-----+----------+-------+
+' |  65 | 41  | 01000001 | A     |
+' +-----+-----+----------+-------+
+' |  66 | 42  | 01000010 | B     |
+' +-----+-----+----------+-------+
+' |  67 | 43  | 01000011 | C     |
+' +-----+-----+----------+-------+
+' |  68 | 44  | 01000100 | D     |
+' +-----+-----+----------+-------+
+' |  69 | 45  | 01000101 | E     |
+' +-----+-----+----------+-------+
+' |  70 | 46  | 01000110 | F     |
+' +-----+-----+----------+-------+
+' |  71 | 47  | 01000111 | G     |
+' +-----+-----+----------+-------+
+' |  72 | 48  | 01001000 | H     |
+' +-----+-----+----------+-------+
+' |  73 | 49  | 01001001 | I     |
+' +-----+-----+----------+-------+
+' |  74 | 4A  | 01001010 | J     |
+' +-----+-----+----------+-------+
+' |  75 | 4B  | 01001011 | K     |
+' +-----+-----+----------+-------+
+' |  76 | 4C  | 01001100 | L     |
+' +-----+-----+----------+-------+
+' |  77 | 4D  | 01001101 | M     |
+' +-----+-----+----------+-------+
+' |  78 | 4E  | 01001110 | N     |
+' +-----+-----+----------+-------+
+' |  79 | 4F  | 01001111 | O     |
+' +-----+-----+----------+-------+
+' |  80 | 50  | 01010000 | P     |
+' +-----+-----+----------+-------+
+' |  81 | 51  | 01010001 | Q     |
+' +-----+-----+----------+-------+
+' |  82 | 52  | 01010010 | R     |
+' +-----+-----+----------+-------+
+' |  83 | 53  | 01010011 | S     |
+' +-----+-----+----------+-------+
+' |  84 | 54  | 01010100 | T     |
+' +-----+-----+----------+-------+
+' |  85 | 55  | 01010101 | U     |
+' +-----+-----+----------+-------+
+' |  86 | 56  | 01010110 | V     |
+' +-----+-----+----------+-------+
+' |  87 | 57  | 01010111 | W     |
+' +-----+-----+----------+-------+
+' |  88 | 58  | 01011000 | X     |
+' +-----+-----+----------+-------+
+' |  89 | 59  | 01011001 | Y     |
+' +-----+-----+----------+-------+
+' |  90 | 5A  | 01011010 | Z     |
+' +-----+-----+----------+-------+
+' |  91 | 5B  | 01011011 | [     |
+' +-----+-----+----------+-------+
+' |  92 | 5C  | 01011100 | \     |
+' +-----+-----+----------+-------+
+' |  93 | 5D  | 01011101 | ]     |
+' +-----+-----+----------+-------+
+' |  94 | 5E  | 01011110 | ^     |
+' +-----+-----+----------+-------+
+' |  95 | 5F  | 01011111 | _     |
+' +-----+-----+----------+-------+
+' |  96 | 60  | 01100000 | `     |
+' +-----+-----+----------+-------+
+' |  97 | 61  | 01100001 | a     |
+' +-----+-----+----------+-------+
+' |  98 | 62  | 01100010 | b     |
+' +-----+-----+----------+-------+
+' |  99 | 63  | 01100011 | c     |
+' +-----+-----+----------+-------+
+' | 100 | 64  | 01100100 | d     |
+' +-----+-----+----------+-------+
+' | 101 | 65  | 01100101 | e     |
+' +-----+-----+----------+-------+
+' | 102 | 66  | 01100110 | f     |
+' +-----+-----+----------+-------+
+' | 103 | 67  | 01100111 | g     |
+' +-----+-----+----------+-------+
+' | 104 | 68  | 01101000 | h     |
+' +-----+-----+----------+-------+
+' | 105 | 69  | 01101001 | i     |
+' +-----+-----+----------+-------+
+' | 106 | 6A  | 01101010 | j     |
+' +-----+-----+----------+-------+
+' | 107 | 6B  | 01101011 | k     |
+' +-----+-----+----------+-------+
+' | 108 | 6C  | 01101100 | l     |
+' +-----+-----+----------+-------+
+' | 109 | 6D  | 01101101 | m     |
+' +-----+-----+----------+-------+
+' | 110 | 6E  | 01101110 | n     |
+' +-----+-----+----------+-------+
+' | 111 | 6F  | 01101111 | o     |
+' +-----+-----+----------+-------+
+' | 112 | 70  | 01110000 | p     |
+' +-----+-----+----------+-------+
+' | 113 | 71  | 01110001 | q     |
+' +-----+-----+----------+-------+
+' | 114 | 72  | 01110010 | r     |
+' +-----+-----+----------+-------+
+' | 115 | 73  | 01110011 | s     |
+' +-----+-----+----------+-------+
+' | 116 | 74  | 01110100 | t     |
+' +-----+-----+----------+-------+
+' | 117 | 75  | 01110101 | u     |
+' +-----+-----+----------+-------+
+' | 118 | 76  | 01110110 | v     |
+' +-----+-----+----------+-------+
+' | 119 | 77  | 01110111 | w     |
+' +-----+-----+----------+-------+
+' | 120 | 78  | 01111000 | x     |
+' +-----+-----+----------+-------+
+' | 121 | 79  | 01111001 | y     |
+' +-----+-----+----------+-------+
+' | 122 | 7A  | 01111010 | z     |
+' +-----+-----+----------+-------+
+' | 123 | 7B  | 01111011 | {     |
+' +-----+-----+----------+-------+
+' | 124 | 7C  | 01111100 | |     |
+' +-----+-----+----------+-------+
+' | 125 | 7D  | 01111101 | }     |
+' +-----+-----+----------+-------+
+' | 126 | 7E  | 01111110 | ~     |
+' +-----+-----+----------+-------+
+' | 127 | 7F  | 01111111 | DEL   |
+' +-----+-----+----------+-------+
+' | 128 | 80  | 10000000 | €     |
+' +-----+-----+----------+-------+
+' | 129 | 81  | 10000001 |       |
+' +-----+-----+----------+-------+
+' | 130 | 82  | 10000010 | ‚     |
+' +-----+-----+----------+-------+
+' | 131 | 83  | 10000011 | ƒ     |
+' +-----+-----+----------+-------+
+' | 132 | 84  | 10000100 | „     |
+' +-----+-----+----------+-------+
+' | 133 | 85  | 10000101 | …     |
+' +-----+-----+----------+-------+
+' | 134 | 86  | 10000110 | †     |
+' +-----+-----+----------+-------+
+' | 135 | 87  | 10000111 | ‡     |
+' +-----+-----+----------+-------+
+' | 136 | 88  | 10001000 | ˆ     |
+' +-----+-----+----------+-------+
+' | 137 | 89  | 10001001 | ‰     |
+' +-----+-----+----------+-------+
+' | 138 | 8A  | 10001010 | Š     |
+' +-----+-----+----------+-------+
+' | 139 | 8B  | 10001011 | ‹     |
+' +-----+-----+----------+-------+
+' | 140 | 8C  | 10001100 | Π    |
+' +-----+-----+----------+-------+
+' | 141 | 8D  | 10001101 |       |
+' +-----+-----+----------+-------+
+' | 142 | 8E  | 10001110 | Ž     |
+' +-----+-----+----------+-------+
+' | 143 | 8F  | 10001111 |       |
+' +-----+-----+----------+-------+
+' | 144 | 90  | 10010000 |       |
+' +-----+-----+----------+-------+
+' | 145 | 91  | 10010001 | ‘     |
+' +-----+-----+----------+-------+
+' | 146 | 92  | 10010010 | ’     |
+' +-----+-----+----------+-------+
+' | 147 | 93  | 10010011 | “     |
+' +-----+-----+----------+-------+
+' | 148 | 94  | 10010100 | ”     |
+' +-----+-----+----------+-------+
+' | 149 | 95  | 10010101 | •     |
+' +-----+-----+----------+-------+
+' | 150 | 96  | 10010110 | –     |
+' +-----+-----+----------+-------+
+' | 151 | 97  | 10010111 | —     |
+' +-----+-----+----------+-------+
+' | 152 | 98  | 10011000 | ˜      |
+' +-----+-----+----------+-------+
+' | 153 | 99  | 10011001 | ™     |
+' +-----+-----+----------+-------+
+' | 154 | 9A  | 10011010 | š     |
+' +-----+-----+----------+-------+
+' | 155 | 9B  | 10011011 | ›     |
+' +-----+-----+----------+-------+
+' | 156 | 9C  | 10011100 | œ     |
+' +-----+-----+----------+-------+
+' | 157 | 9D  | 10011101 |       |
+' +-----+-----+----------+-------+
+' | 158 | 9E  | 10011110 | ž     |
+' +-----+-----+----------+-------+
+' | 159 | 9F  | 10011111 | Ÿ     |
+' +-----+-----+----------+-------+
+' | 160 | A0  | 10100000 |       |
+' +-----+-----+----------+-------+
+' | 161 | A1  | 10100001 | ¡     |
+' +-----+-----+----------+-------+
+' | 162 | A2  | 10100010 | ¢     |
+' +-----+-----+----------+-------+
+' | 163 | A3  | 10100011 | £     |
+' +-----+-----+----------+-------+
+' | 164 | A4  | 10100100 | ¤     |
+' +-----+-----+----------+-------+
+' | 165 | A5  | 10100101 | ¥     |
+' +-----+-----+----------+-------+
+' | 166 | A6  | 10100110 | ¦     |
+' +-----+-----+----------+-------+
+' | 167 | A7  | 10100111 | §     |
+' +-----+-----+----------+-------+
+' | 168 | A8  | 10101000 | ¨     |
+' +-----+-----+----------+-------+
+' | 169 | A9  | 10101001 | ©     |
+' +-----+-----+----------+-------+
+' | 170 | AA  | 10101010 | ª     |
+' +-----+-----+----------+-------+
+' | 171 | AB  | 10101011 | «     |
+' +-----+-----+----------+-------+
+' | 172 | AC  | 10101100 | ¬     |
+' +-----+-----+----------+-------+
+' | 173 | AD  | 10101101 | ­     |
+' +-----+-----+----------+-------+
+' | 174 | AE  | 10101110 | ®     |
+' +-----+-----+----------+-------+
+' | 175 | AF  | 10101111 | ¯     |
+' +-----+-----+----------+-------+
+' | 176 | B0  | 10110000 | °     |
+' +-----+-----+----------+-------+
+' | 177 | B1  | 10110001 | ±     |
+' +-----+-----+----------+-------+
+' | 178 | B2  | 10110010 | ²     |
+' +-----+-----+----------+-------+
+' | 179 | B3  | 10110011 | ³     |
+' +-----+-----+----------+-------+
+' | 180 | B4  | 10110100 | ´     |
+' +-----+-----+----------+-------+
+' | 181 | B5  | 10110101 | µ     |
+' +-----+-----+----------+-------+
+' | 182 | B6  | 10110110 | ¶     |
+' +-----+-----+----------+-------+
+' | 183 | B7  | 10110111 | ·     |
+' +-----+-----+----------+-------+
+' | 184 | B8  | 10111000 | ¸     |
+' +-----+-----+----------+-------+
+' | 185 | B9  | 10111001 | ¹     |
+' +-----+-----+----------+-------+
+' | 186 | BA  | 10111010 | º     |
+' +-----+-----+----------+-------+
+' | 187 | BB  | 10111011 | »     |
+' +-----+-----+----------+-------+
+' | 188 | BC  | 10111100 | ¼     |
+' +-----+-----+----------+-------+
+' | 189 | BD  | 10111101 | ½     |
+' +-----+-----+----------+-------+
+' | 190 | BE  | 10111110 | ¾     |
+' +-----+-----+----------+-------+
+' | 191 | BF  | 10111111 | ¿     |
+' +-----+-----+----------+-------+
+' | 192 | C0  | 11000000 | À     |
+' +-----+-----+----------+-------+
+' | 193 | C1  | 11000001 | Á     |
+' +-----+-----+----------+-------+
+' | 194 | C2  | 11000010 | Â     |
+' +-----+-----+----------+-------+
+' | 195 | C3  | 11000011 | Ã     |
+' +-----+-----+----------+-------+
+' | 196 | C4  | 11000100 | Ä     |
+' +-----+-----+----------+-------+
+' | 197 | C5  | 11000101 | Å     |
+' +-----+-----+----------+-------+
+' | 198 | C6  | 11000110 | Æ     |
+' +-----+-----+----------+-------+
+' | 199 | C7  | 11000111 | Ç     |
+' +-----+-----+----------+-------+
+' | 200 | C8  | 11001000 | È     |
+' +-----+-----+----------+-------+
+' | 201 | C9  | 11001001 | É     |
+' +-----+-----+----------+-------+
+' | 202 | CA  | 11001010 | Ê     |
+' +-----+-----+----------+-------+
+' | 203 | CB  | 11001011 | Ë     |
+' +-----+-----+----------+-------+
+' | 204 | CC  | 11001100 | Ì     |
+' +-----+-----+----------+-------+
+' | 205 | CD  | 11001101 | Í     |
+' +-----+-----+----------+-------+
+' | 206 | CE  | 11001110 | Î     |
+' +-----+-----+----------+-------+
+' | 207 | CF  | 11001111 | Ï     |
+' +-----+-----+----------+-------+
+' | 208 | D0  | 11010000 | Ð     |
+' +-----+-----+----------+-------+
+' | 209 | D1  | 11010001 | Ñ     |
+' +-----+-----+----------+-------+
+' | 210 | D2  | 11010010 | Ò     |
+' +-----+-----+----------+-------+
+' | 211 | D3  | 11010011 | Ó     |
+' +-----+-----+----------+-------+
+' | 212 | D4  | 11010100 | Ô     |
+' +-----+-----+----------+-------+
+' | 213 | D5  | 11010101 | Õ     |
+' +-----+-----+----------+-------+
+' | 214 | D6  | 11010110 | Ö     |
+' +-----+-----+----------+-------+
+' | 215 | D7  | 11010111 | ×     |
+' +-----+-----+----------+-------+
+' | 216 | D8  | 11011000 | Ø     |
+' +-----+-----+----------+-------+
+' | 217 | D9  | 11011001 | Ù     |
+' +-----+-----+----------+-------+
+' | 218 | DA  | 11011010 | Ú     |
+' +-----+-----+----------+-------+
+' | 219 | DB  | 11011011 | Û     |
+' +-----+-----+----------+-------+
+' | 220 | DC  | 11011100 | Ü     |
+' +-----+-----+----------+-------+
+' | 221 | DD  | 11011101 | Ý     |
+' +-----+-----+----------+-------+
+' | 222 | DE  | 11011110 | Þ     |
+' +-----+-----+----------+-------+
+' | 223 | DF  | 11011111 | ß     |
+' +-----+-----+----------+-------+
+' | 224 | E0  | 11100000 | à     |
+' +-----+-----+----------+-------+
+' | 225 | E1  | 11100001 | á     |
+' +-----+-----+----------+-------+
+' | 226 | E2  | 11100010 | â     |
+' +-----+-----+----------+-------+
+' | 227 | E3  | 11100011 | ã     |
+' +-----+-----+----------+-------+
+' | 228 | E4  | 11100100 | ä     |
+' +-----+-----+----------+-------+
+' | 229 | E5  | 11100101 | å     |
+' +-----+-----+----------+-------+
+' | 230 | E6  | 11100110 | æ     |
+' +-----+-----+----------+-------+
+' | 231 | E7  | 11100111 | ç     |
+' +-----+-----+----------+-------+
+' | 232 | E8  | 11101000 | è     |
+' +-----+-----+----------+-------+
+' | 233 | E9  | 11101001 | é     |
+' +-----+-----+----------+-------+
+' | 234 | EA  | 11101010 | ê     |
+' +-----+-----+----------+-------+
+' | 235 | EB  | 11101011 | ë     |
+' +-----+-----+----------+-------+
+' | 236 | EC  | 11101100 | ì     |
+' +-----+-----+----------+-------+
+' | 237 | ED  | 11101101 | í     |
+' +-----+-----+----------+-------+
+' | 238 | EE  | 11101110 | î     |
+' +-----+-----+----------+-------+
+' | 239 | EF  | 11101111 | ï     |
+' +-----+-----+----------+-------+
+' | 240 | F0  | 11110000 | ð     |
+' +-----+-----+----------+-------+
+' | 241 | F1  | 11110001 | ñ     |
+' +-----+-----+----------+-------+
+' | 242 | F2  | 11110010 | ò     |
+' +-----+-----+----------+-------+
+' | 243 | F3  | 11110011 | ó     |
+' +-----+-----+----------+-------+
+' | 244 | F4  | 11110100 | ô     |
+' +-----+-----+----------+-------+
+' | 245 | F5  | 11110101 | õ     |
+' +-----+-----+----------+-------+
+' | 246 | F6  | 11110110 | ö     |
+' +-----+-----+----------+-------+
+' | 247 | F7  | 11110111 | ÷     |
+' +-----+-----+----------+-------+
+' | 248 | F8  | 11111000 | ø     |
+' +-----+-----+----------+-------+
+' | 249 | F9  | 11111001 | ù     |
+' +-----+-----+----------+-------+
+' | 250 | FA  | 11111010 | ú     |
+' +-----+-----+----------+-------+
+' | 251 | FB  | 11111011 | û     |
+' +-----+-----+----------+-------+
+' | 252 | FC  | 11111100 | ü     |
+' +-----+-----+----------+-------+
+' | 253 | FD  | 11111101 | ý     |
+' +-----+-----+----------+-------+
+' | 254 | FE  | 11111110 | þ     |
+' +-----+-----+----------+-------+
+' | 255 | FF  | 11111111 | ÿ     |
+' +-----+-----+----------+-------+
diff --git a/Testing/Testing.accdb.src/forms/frmMain.bas b/Testing/Testing.accdb.src/forms/frmMain.bas
new file mode 100644
index 00000000..db651d2e
--- /dev/null
+++ b/Testing/Testing.accdb.src/forms/frmMain.bas
@@ -0,0 +1,624 @@
+Version =20
+VersionRequired =20
+Begin Form
+    RecordSelectors = NotDefault
+    NavigationButtons = NotDefault
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    DefaultView =0
+    TabularFamily =18
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =9360
+    DatasheetFontHeight =11
+    ItemSuffix =13
+    Right =19650
+    Bottom =12585
+    RecSrcDt = Begin
+        0x18691eff0b76e540
+    End
+    Caption ="Main Form"
+    DatasheetFontName ="Palatino Linotype"
+    OnLoad ="[Event Procedure]"
+    FilterOnLoad =0
+    ShowPageMargins =0
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    ThemeName ="Executive"
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Image
+            BackStyle =0
+            OldBorderStyle =0
+            BorderLineStyle =0
+            SizeMode =3
+            PictureAlignment =2
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin CommandButton
+            FontSize =11
+            FontWeight =400
+            FontName ="Calibri"
+            ForeThemeColorIndex =0
+            ForeTint =75.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+            UseTheme =1
+            Shape =1
+            Gradient =12
+            BackThemeColorIndex =4
+            BackTint =60.0
+            BorderLineStyle =0
+            BorderThemeColorIndex =4
+            BorderTint =60.0
+            ThemeFontIndex =1
+            HoverThemeColorIndex =4
+            HoverTint =40.0
+            PressedThemeColorIndex =4
+            PressedShade =75.0
+            HoverForeThemeColorIndex =0
+            HoverForeTint =75.0
+            PressedForeThemeColorIndex =0
+            PressedForeTint =75.0
+        End
+        Begin ListBox
+            BorderLineStyle =0
+            LabelX =-1800
+            FontSize =11
+            FontName ="Calibri"
+            AllowValueListEdits =1
+            InheritValueList =1
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            ForeThemeColorIndex =0
+            ForeTint =75.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin UnboundObjectFrame
+            SpecialEffect =2
+            OldBorderStyle =1
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            ForeThemeColorIndex =2
+            ForeShade =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin CustomControl
+            OldBorderStyle =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin Section
+            Height =7620
+            Name ="Detail"
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =18
+                    Left =5400
+                    Top =2940
+                    Width =3120
+                    Height =720
+                    ForeColor =4210752
+                    Name ="cmdRunTests"
+                    Caption ="  Verify Database Objects"
+                    OnClick ="[Event Procedure]"
+                    FontName ="Palatino Linotype"
+                    GridlineColor =10921638
+                    ImageData = Begin
+                        0x2800000010000000100000000100200000000000000000000000000000000000 ,
+                        0x0000000000000000b0a090ff604830ff604830ff604830ff604830ff604830ff ,
+                        0x604830ff604830ff604830ff604830ff604830ff000000000000000000000000 ,
+                        0x0000000000000000b0a090fffff8f0ffe0e0e0ffe0d8d0ffe0d8d0ffe0d0c0ff ,
+                        0xe0c8c0ffd0c0b0ffd0c0b0ffd0b8a0ff604830ff000000000000000000000000 ,
+                        0x0000000000000000b0a090ffffffffffd0b8b0ffd0b8a0ffd0b0a0ffb0a090ff ,
+                        0x604830ff604830ff604830ff604830ff604830ff604830ff604830ff604830ff ,
+                        0x604830ff604830ffb0a090fffffffffffffffffffff8f0fffff0f0ffb0a090ff ,
+                        0xfff8f0ffe0e0e0ffe0d8d0ffe0d8d0ffe0d0c0ffe0c8c0ffd0c0b0ffd0c0b0ff ,
+                        0xd0b8a0ff604830ffc0a8a0ffffffffffe0c8c0ffe0c8c0ffd0c0b0ffb0a090ff ,
+                        0xffffffffd0b8b0ffd0b8a0ffd0b0a0ffffe8e0ffc09080ffc09080ffc09080ff ,
+                        0xd0b8b0ff604830ffc0b0a0ffffffffffb0a090ff604830ff604830ffb0a090ff ,
+                        0xfffffffffffffffffff8f0fffff0f0fffff0e0ffffe8e0ffffe0d0ffffd8d0ff ,
+                        0xd0c0b0ff604830ffd0b0a0ffffffffffb0a090fffff8f0ffe0e0e0ffc0a8a0ff ,
+                        0xffffffffe0c8c0ffe0c8c0ffd0c0b0fffff8f0ffc0a890ffc0a890ffc0a090ff ,
+                        0xe0d0c0ff604830ffd0b8a0ffffffffffb0a090ffffffffffd0b8b0ffc0b0a0ff ,
+                        0xfffffffffffffffffffffffffffffffffffffffffff8f0fffff0f0ffffe8e0ff ,
+                        0xe0d8d0ff604830fff0a890fff0a880ffb0a090ffffffffffffffffffd0b0a0ff ,
+                        0xffffffffe0c8c0ffe0c8c0ffe0c8c0ffffffffffd0b0a0ffd0b0a0ffd0a8a0ff ,
+                        0xe0e0e0ff604830fff0a890ffffc0a0ffc0a8a0ffffffffffe0c8c0ffd0b8a0ff ,
+                        0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8ffff ,
+                        0xfff8f0ff604830fff0a890fff0a880ffc0b0a0fffffffffffffffffff0a890ff ,
+                        0xf0a880fff0a080fff0a070ffe09870ffe09060ffe08860ffe08050ffe07840ff ,
+                        0xe07840ffd06030ff0000000000000000d0b0a0ffffffffffe0c8c0fff0a890ff ,
+                        0xffc0a0ffffc0a0ffffb890ffffb890ffffb090ffffa880fff0a070fff0a070ff ,
+                        0xf09870ffd06830ff0000000000000000d0b8a0fffffffffffffffffff0a890ff ,
+                        0xf0a880fff0a080fff0a080ffe09870ffe09060ffe08860ffe08850ffe08050ff ,
+                        0xe07840ffe07840ff0000000000000000f0a890fff0a880fff0a080fff0a070ff ,
+                        0xe09870ffe09060ffe08860ffe08050ffe07840ffe07840ffd06030ff00000000 ,
+                        0x00000000000000000000000000000000f0a890ffffc0a0ffffc0a0ffffb890ff ,
+                        0xffb890ffffb090ffffa880fff0a070fff0a070fff09870ffd06830ff00000000 ,
+                        0x00000000000000000000000000000000f0a890fff0a880fff0a080fff0a080ff ,
+                        0xe09870ffe09060ffe08860ffe08850ffe08050ffe07840ffe07840ff00000000 ,
+                        0x0000000000000000
+                    End
+
+                    LayoutCachedLeft =5400
+                    LayoutCachedTop =2940
+                    LayoutCachedWidth =8520
+                    LayoutCachedHeight =3660
+                    PictureCaptionArrangement =5
+                    BackColor =13807008
+                    BorderColor =13807008
+                    HoverColor =14796991
+                    PressedColor =9262658
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                    Overlaps =1
+                End
+                Begin ListBox
+                    RowSourceTypeInt =1
+                    OverlapFlags =85
+                    TextFontFamily =18
+                    IMESentenceMode =3
+                    ColumnCount =2
+                    Left =600
+                    Top =1140
+                    Width =4455
+                    Height =5745
+                    TabIndex =1
+                    ForeColor =4210752
+                    BorderColor =10921638
+                    Name ="lstResults"
+                    RowSourceType ="Value List"
+                    RowSource ="✔;Access Table exists;✔;tblInternal has data;✔;Linked Table exists;✔;tblLinkedCS"
+                        "V has data;✔;Saved Table Data (TDF);✔;Saved Table Data (XML);✔;Table SQL;✔;Linke"
+                        "d Table JSON;✔;Linked Table structure;✔;Table Relationship;✔;Table Data Macro Ex"
+                        "ists;✔;Query exists;✔;Form exists;✔;Report exists;✔;Application Icon is set;✔;Cu"
+                        "stom Database (DAO) property;✔;Custom Project Property"
+                    ColumnWidths ="479;3975"
+                    FontName ="Palatino Linotype"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =600
+                    LayoutCachedTop =1140
+                    LayoutCachedWidth =5055
+                    LayoutCachedHeight =6885
+                    Begin
+                        Begin Label
+                            OverlapFlags =85
+                            TextFontFamily =18
+                            Left =780
+                            Top =720
+                            Width =2880
+                            Height =320
+                            BorderColor =8355711
+                            ForeColor =8355711
+                            Name ="Col1_Label"
+                            Caption ="Test Results"
+                            FontName ="Palatino Linotype"
+                            GridlineColor =10921638
+                            LayoutCachedLeft =780
+                            LayoutCachedTop =720
+                            LayoutCachedWidth =3660
+                            LayoutCachedHeight =1040
+                        End
+                    End
+                End
+                Begin Label
+                    OverlapFlags =85
+                    TextFontFamily =18
+                    Left =5400
+                    Top =1140
+                    Width =3720
+                    Height =1635
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label4"
+                    Caption ="Click the button below to verify the objects in the current database. This helps"
+                        " confirm that everything was correctly reconstructed from source."
+                    FontName ="Palatino Linotype"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =5400
+                    LayoutCachedTop =1140
+                    LayoutCachedWidth =9120
+                    LayoutCachedHeight =2775
+                End
+                Begin CommandButton
+                    OverlapFlags =85
+                    TextFontFamily =18
+                    Left =5400
+                    Top =3900
+                    Width =3120
+                    Height =720
+                    TabIndex =2
+                    ForeColor =4210752
+                    Name ="cmdEditTests"
+                    Caption ="  Edit Tests..."
+                    OnClick ="[Event Procedure]"
+                    FontName ="Palatino Linotype"
+                    GridlineColor =10921638
+                    ImageData = Begin
+                        0x2800000010000000100000000100200000000000000000000000000000000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x000000000000000000000000000000000000000000000000bb461e4800000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x000000003088305000000000000000000000000080281040803010ffd0502040 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x20302040005000ff40a040400000000080281040e05020ff803010ff803010ff ,
+                        0xd050204000000000000000000000000000000000000000000000000020302040 ,
+                        0x208030ff005000ff005000ff30983040e05020ffe06840ffe09880ffd07860ff ,
+                        0x803010ff00000000000000000038f040001890ff0018803000000000208030ff ,
+                        0x309850ff60c080ff208030ff005000ffe07050fff0a890ffffc8b0fff0b8a0ff ,
+                        0xc07050ff000000000030f0400038ffff001890ff001890ff0018803030a850ff ,
+                        0x80d890ffb0e8c0ff90e0a0ff208030fff0907020f08870ffffc0b0fff09070ff ,
+                        0xf0907040000000000030f0ff2058ffff7098ffff0028d0ff001890ff40c07040 ,
+                        0x30a850ffa0e8b0ff30a850ff60986040706860c0b0786030f09070fff0907070 ,
+                        0x00000000000000001050ffff90a8ffffa0c0ffff7098ffff0020b0ff00000000 ,
+                        0x40c0604030a850ff50a87040706860f070686020000000000018801000000000 ,
+                        0x00000000000000005080ff405078ffffa0b0ffff5078ffff6070c04000000000 ,
+                        0x0000000070686020706860e070686020706860e02048d060001890ff00188020 ,
+                        0x0000000000000000000000005080ff405080ffff6070b050706860e070686020 ,
+                        0x70686020706860e070686010000000002048c0600038ffff001890ff001890ff ,
+                        0x00188020000000000000000000000000000000000000000070686030508090a0 ,
+                        0x006080ff2060707000000000000000000030f0ff2058ffff7098ffff0028d0ff ,
+                        0x001890ff000000000000000000000000000000000000000000a8f04000a0e0ff ,
+                        0x006890ff006890ff00608070000000001050ffff90a8ffffa0c0ffff7098ffff ,
+                        0x0020b0ff000000000000000000000000000000000000000000a0e0ff10b0e0ff ,
+                        0x80e0ffff0090c0ff006890ff000000005080ff405078ffffa0b0ffff5078ffff ,
+                        0x5078ff40000000000000000000000000000000000000000000a0e0ff90e8ffff ,
+                        0xb0f0ffff90e0ffff00a0e0ff00000000000000005080ff405080ffff5080ff40 ,
+                        0x00000000000000000000000000000000000000000000000040c8ff4000a0e0ff ,
+                        0xa0e8ffff00a0e0ff50d0ff400000000000000000000000000000000000000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000060d0ff70 ,
+                        0x00a0e0ff50d0ff40000000000000000000000000000000000000000000000000 ,
+                        0x0000000000000000
+                    End
+
+                    LayoutCachedLeft =5400
+                    LayoutCachedTop =3900
+                    LayoutCachedWidth =8520
+                    LayoutCachedHeight =4620
+                    PictureCaptionArrangement =5
+                    BackColor =13807008
+                    BorderColor =13807008
+                    HoverColor =14796991
+                    PressedColor =9262658
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                    Overlaps =1
+                End
+                Begin Label
+                    OverlapFlags =93
+                    TextFontFamily =18
+                    Left =5400
+                    Top =4860
+                    Width =3060
+                    Height =1635
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="lblResults"
+                    Caption ="17 tests passed\015\0120 tests failed"
+                    FontName ="Palatino Linotype"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =5400
+                    LayoutCachedTop =4860
+                    LayoutCachedWidth =8460
+                    LayoutCachedHeight =6495
+                End
+                Begin Image
+                    PictureType =2
+                    Left =7860
+                    Top =4860
+                    Width =600
+                    Height =720
+                    BorderColor =10921638
+                    Name ="imgResult"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =7860
+                    LayoutCachedTop =4860
+                    LayoutCachedWidth =8460
+                    LayoutCachedHeight =5580
+                    TabIndex =3
+                End
+            End
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit
+
+
+' Keep track of total results
+Private m_Totals(True To False) As Integer
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : cmdRunTests_Click
+' Author    : Adam Waller
+' Date      : 5/1/2020
+' Purpose   : Trying to keep things simple here... Verify that the object exists in the
+'           : correct format. (Adjust as needed)
+'---------------------------------------------------------------------------------------
+'
+Public Sub cmdRunTests_Click()
+
+    Dim strTest As String
+    Dim intTest As Integer
+    Dim dbs As DAO.Database
+    Dim rsc As SharedResource
+
+    Set dbs = CurrentDb
+
+    ' Clear list and totals
+    lstResults.RowSource = ""
+    m_Totals(True) = 0
+    m_Totals(False) = 0
+
+    ' Ignore any errors.
+    ' NOTE: don't include the test result on a line that may throw an error.
+    On Error Resume Next
+
+    ' Update linked tables/CSV to use the current directory
+    dbs.TableDefs("tblLinkedAccess").Connect = ";DATABASE=" & Application.CurrentProject.Path & "\Testing.accdb"
+    dbs.TableDefs("tblLinkedAccess").RefreshLink
+    dbs.TableDefs("tblLinkedCSV").Connect = "Text;DSN=Linked Link Specification;FMT=Delimited;HDR=NO;IMEX=2;CharacterSet=437;ACCDB=YES;DATABASE=" & Application.CurrentProject.Path
+    dbs.TableDefs("tblLinkedCSV").RefreshLink
+
+    '========================
+    '   BEGIN TESTS
+    '========================
+
+    ' Tables
+    strTest = dbs.TableDefs("tblInternal").Name
+    ShowResult "Access Table exists", (strTest = "tblInternal")
+
+    intTest = 0
+    intTest = DCount("*", "tblInternal")
+    ShowResult "tblInternal has data", (intTest > 0)
+
+    strTest = dbs.TableDefs("tblLinkedCSV").Name
+    ShowResult "Linked Table exists", (strTest = "tblLinkedCSV")
+
+    intTest = 0
+    intTest = DCount("*", "tblLinkedCSV")
+    ShowResult "tblLinkedCSV has data", (intTest > 0)
+
+    ShowResult "Saved Table Data (TDF)", FSO.FileExists(ExportFolder & "tables\tblInternal.txt")
+
+    ShowResult "Saved Table Data (XML)", FSO.FileExists(ExportFolder & "tables\tblSaveXML.xml")
+
+    ShowResult "Table SQL", FSO.FileExists(ExportFolder & "tbldefs\tblInternal.sql")
+
+    ShowResult "Linked Table JSON", FSO.FileExists(ExportFolder & "tbldefs\tblLinkedCSV.json")
+
+    ShowResult "Linked Table structure", FSO.FileExists(ExportFolder & "tbldefs\tblLinkedCSV.sql")
+
+    intTest = 0
+    intTest = dbs.Relations("tblInternaltblSaveXML").Fields.Count
+    ShowResult "Table Relationship", (intTest = 1)
+
+    intTest = 0
+    intTest = DCount("*", "MSysObjects", "Not IsNull(LvExtra) and Type = 1 and [Name] = 'tblSaveXML'")
+    ShowResult "Table Data Macro Exists", (intTest > 0)
+
+
+    ' Queries
+    strTest = dbs.QueryDefs("qryNavigationPaneGroups").Name
+    ShowResult "Query exists", (strTest = "qryNavigationPaneGroups")
+
+
+    ' Forms
+    strTest = CurrentProject.AllForms("frmMain").Name
+    ShowResult "Form exists", (strTest = "frmMain")
+
+
+    ' Reports
+    strTest = CurrentProject.AllReports("rptNavigationPaneGroups").Name
+    ShowResult "Report exists", (strTest = "rptNavigationPaneGroups")
+    ShowResult "Landscape Orientation", (Report_rptNonDefaultPaperSize.Printer.Orientation = acPRORLandscape)
+    ShowResult "A4 Paper Size", (Report_rptNonDefaultPaperSize.Printer.PaperSize = acPRPSA4)
+
+
+    ' Macros
+    strTest = CurrentProject.AllMacros("AutoExec").Name
+    ShowResult "Macro exists", (strTest = "AutoExec")
+
+
+    ' Modules
+    strTest = CurrentProject.AllModules("basUtility").Name
+    ShowResult "Standard Module exists", (strTest = "basUtility")
+    strTest = GetVBProjectForCurrentDB.VBComponents("basExtendedChars").CodeModule.Lines(6, 1)
+    ShowResult "Extended ASCII text in VBA", (Mid$(strTest, 10, 1) = Chr(151))
+
+    strTest = CurrentProject.AllModules("clsPerson").Name
+    ShowResult "Class Module exists", (strTest = "clsPerson")
+
+
+    ' Database properties
+    strTest = ""
+    strTest = dbs.Properties("AppIcon")
+    ShowResult "Application Icon is set", (Len(strTest) > 5)
+
+    strTest = dbs.Properties("DAOProperty").Value
+    ShowResult "Custom Database (DAO) property", (strTest = "DAO")
+
+    strTest = CurrentProject.Properties("ProjectProperty").Value
+    ShowResult "Custom Project Property", (strTest = "TestValue")
+
+    strTest = dbs.Containers("Databases").Documents("SummaryInfo").Properties("Title")
+    ShowResult "Database Summary Property (Title)", (strTest = "VCS Testing")
+
+    strTest = dbs.Containers("Tables").Documents("tblSaveXML").Properties("Description")
+    ShowResult "Navigation pane object description", (strTest = "Saved description in XML table.")
+
+    strTest = dbs.Containers("Modules").Documents("basUtility").Properties("Description")
+    ShowResult "Module description", (strTest = "My special description on the code module.")
+
+    ShowResult "Saved shared images", (CurrentProject.Resources.Count > 2)
+
+    ShowResult "Saved import/export specs (XML)", (CurrentProject.ImportExportSpecifications.Count > 0)
+
+    strTest = CurrentProject.ImportExportSpecifications(0).Name
+    ShowResult "Name of saved specification", (strTest = "Export-MSysIMEXColumns")
+
+    strTest = Nz(DLookup("SpecName", "MSysIMEXSpecs", "SpecName=""Test 2"""))
+    ShowResult "Saved IMEX spec (Table based)", (strTest = "Test 2")
+
+    strTest = Nz(DLookup("Name", "MSysNavPaneGroups", "Name=""My Modules"""))
+    ShowResult "Custom navigation pane group", (strTest = "My Modules")
+
+    ' VBE Project
+    With GetVBProjectForCurrentDB
+
+        ShowResult "VBE project name", (.Name = "VCS Testing")
+        ShowResult "VBE project description", (.Description = "For automated testing of Version Control")
+        ShowResult "Help context id", (.HelpContextId = 123456)
+
+        strTest = .References("Scripting").Name
+        ShowResult "GUID reference (scripting)", (strTest = "Scripting")
+
+        strTest = .References("MSForms").Name
+        ShowResult "MS Forms 2.0 reference", (strTest = "MSForms")
+
+    End With
+
+    ' Theme
+    strTest = CurrentDb.Properties("Theme Resource Name")
+    ShowResult "Active theme = Angles", (strTest = "Angles")
+
+    strTest = vbNullString
+    For Each rsc In CurrentProject.Resources
+        If rsc.Type = acResourceTheme Then
+            strTest = rsc.Name
+            If strTest = "Angles" Then Exit For
+        End If
+    Next rsc
+    ShowResult "Theme resource exists", (strTest = "Angles")
+
+    ' Other
+    ShowResult "VCS Options file exists", FSO.FileExists(ExportFolder & "vcs-options.json")
+
+
+    '========================
+    '   END TESTS
+    '========================
+
+    ' Display results
+    lblResults.Caption = _
+        m_Totals(True) & " tests passed" & vbCrLf & _
+        m_Totals(False) & " tests failed"
+
+    If m_Totals(False) = 0 Then
+        imgResult.Picture = "button_ok"
+    Else
+        imgResult.Picture = "button_error"
+    End If
+
+    If Err Then Err.Clear
+
+End Sub
+
+
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : ShowResult
+' Author    : Adam Waller
+' Date      : 5/1/2020
+' Purpose   : Add the result to the list.
+'---------------------------------------------------------------------------------------
+'
+Private Function ShowResult(strText As String, blnPassed As Boolean)
+    Dim strIcon As String
+    If blnPassed Then
+        strIcon = ChrW(10004)   ' Check
+    Else
+        strIcon = ChrW(10060)   ' X
+    End If
+    lstResults.AddItem strIcon & ";" & strText
+    m_Totals(blnPassed) = m_Totals(blnPassed) + 1
+    DoEvents
+End Function
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : cmdEditTests_Click
+' Author    : Adam Waller
+' Date      : 5/1/2020
+' Purpose   : Go to the code where you can edit the tests.
+'---------------------------------------------------------------------------------------
+'
+Private Sub cmdEditTests_Click()
+    Dim intLine As Integer
+    VBE.MainWindow.Visible = True
+    With VBE.VBProjects("VCS Testing").VBComponents("Form_frmMain")
+        .Activate
+        With .CodeModule
+            intLine = 27 + .ProcStartLine("cmdRunTests_Click", vbext_pk_Proc)
+            .CodePane.SetSelection intLine, 1, intLine, 1
+            .CodePane.Show
+        End With
+    End With
+    AppActivate VBE.MainWindow.Caption
+End Sub
+
+
+'---------------------------------------------------------------------------------------
+' Procedure : ExportFolder
+' Author    : Adam Waller
+' Date      : 5/7/2020
+' Purpose   : Return base export folder for testing for source files.
+'---------------------------------------------------------------------------------------
+'
+Private Function ExportFolder() As String
+    ExportFolder = CurrentProject.FullName & ".src\"
+End Function
+
+
+Private Sub Form_Load()
+    imgResult.Picture = vbNullString
+End Sub
diff --git a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
new file mode 100644
index 00000000..d3e1c296
--- /dev/null
+++ b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
@@ -0,0 +1,99 @@
+Version =20
+VersionRequired =20
+Begin Report
+    LayoutForPrint = NotDefault
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    TabularFamily =0
+    DateGrouping =1
+    GrpKeepTogether =1
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =8884
+    DatasheetFontHeight =11
+    ItemSuffix =1
+    RecSrcDt = Begin
+        0xe05ff061b477e540
+    End
+    DatasheetFontName ="Franklin Gothic Book"
+    FilterOnLoad =0
+    FitToPage =1
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin PageHeader
+            Height =360
+            Name ="PageHeaderSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+        Begin Section
+            KeepTogether = NotDefault
+            Height =7560
+            Name ="Detail"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin Label
+                    TextFontFamily =0
+                    Left =1260
+                    Top =240
+                    Width =4800
+                    Height =420
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label0"
+                    Caption ="This report does not have any saved print settings."
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =1260
+                    LayoutCachedTop =240
+                    LayoutCachedWidth =6060
+                    LayoutCachedHeight =660
+                End
+            End
+        End
+        Begin PageFooter
+            Height =360
+            Name ="PageFooterSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit
diff --git a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
new file mode 100644
index 00000000..f8cde805
--- /dev/null
+++ b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
@@ -0,0 +1,286 @@
+Version =20
+VersionRequired =20
+Begin Report
+    LayoutForPrint = NotDefault
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    TabularFamily =0
+    DateGrouping =1
+    GrpKeepTogether =1
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =11700
+    DatasheetFontHeight =11
+    ItemSuffix =7
+    RecSrcDt = Begin
+        0x2df649898e77e540
+    End
+    RecordSource ="qryNavigationPaneGroups"
+    Caption ="qryNavigationPaneGroups"
+    DatasheetFontName ="Franklin Gothic Book"
+    FilterOnLoad =0
+    FitToPage =1
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin TextBox
+            AddColon = NotDefault
+            FELineBreak = NotDefault
+            BorderLineStyle =0
+            LabelX =-1800
+            FontSize =11
+            FontName ="Calibri"
+            AsianLineBreak =1
+            ShowDatePicker =0
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =1
+            BorderShade =65.0
+            ThemeFontIndex =1
+            ForeThemeColorIndex =0
+            ForeTint =75.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin BreakLevel
+            GroupHeader = NotDefault
+            ControlSource ="ObjectName"
+        End
+        Begin BreakLevel
+            ControlSource ="GroupName"
+        End
+        Begin FormHeader
+            KeepTogether = NotDefault
+            Height =960
+            Name ="ReportHeader"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =2
+            BackTint =20.0
+            Begin
+                Begin Label
+                    TextFontFamily =0
+                    Left =60
+                    Top =60
+                    Width =4350
+                    Height =540
+                    FontSize =20
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label4"
+                    Caption ="qryNavigationPaneGroups"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =60
+                    LayoutCachedTop =60
+                    LayoutCachedWidth =4410
+                    LayoutCachedHeight =600
+                End
+            End
+        End
+        Begin PageHeader
+            Height =435
+            Name ="PageHeaderSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin Label
+                    TextAlign =1
+                    TextFontFamily =0
+                    Left =360
+                    Top =60
+                    Width =3660
+                    Height =315
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="ObjectName_Label"
+                    Caption ="ObjectName"
+                    FontName ="Franklin Gothic Book"
+                    Tag ="DetachedLabel"
+                    GridlineStyleBottom =1
+                    GridlineColor =10921638
+                    LayoutCachedLeft =360
+                    LayoutCachedTop =60
+                    LayoutCachedWidth =4020
+                    LayoutCachedHeight =375
+                End
+                Begin Label
+                    TextAlign =1
+                    TextFontFamily =0
+                    Left =4380
+                    Top =60
+                    Width =7260
+                    Height =315
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="GroupName_Label"
+                    Caption ="GroupName"
+                    FontName ="Franklin Gothic Book"
+                    Tag ="DetachedLabel"
+                    GridlineStyleBottom =1
+                    GridlineColor =10921638
+                    LayoutCachedLeft =4380
+                    LayoutCachedTop =60
+                    LayoutCachedWidth =11640
+                    LayoutCachedHeight =375
+                End
+            End
+        End
+        Begin BreakHeader
+            KeepTogether = NotDefault
+            Height =390
+            Name ="GroupHeader0"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin TextBox
+                    DecimalPlaces =0
+                    OldBorderStyle =0
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =360
+                    Width =3660
+                    Height =330
+                    ColumnWidth =1665
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="ObjectName"
+                    ControlSource ="ObjectName"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =360
+                    LayoutCachedWidth =4020
+                    LayoutCachedHeight =330
+                End
+            End
+        End
+        Begin Section
+            KeepTogether = NotDefault
+            Height =390
+            Name ="Detail"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin TextBox
+                    OldBorderStyle =0
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =4380
+                    Width =7260
+                    Height =330
+                    ColumnWidth =1545
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="GroupName"
+                    ControlSource ="GroupName"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =4380
+                    LayoutCachedWidth =11640
+                    LayoutCachedHeight =330
+                End
+            End
+        End
+        Begin PageFooter
+            Height =570
+            Name ="PageFooterSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin TextBox
+                    OldBorderStyle =0
+                    TextAlign =1
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =60
+                    Top =240
+                    Width =5040
+                    Height =330
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text5"
+                    ControlSource ="=Now()"
+                    Format ="Long Date"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =60
+                    LayoutCachedTop =240
+                    LayoutCachedWidth =5100
+                    LayoutCachedHeight =570
+                End
+                Begin TextBox
+                    OldBorderStyle =0
+                    TextAlign =3
+                    TextFontFamily =0
+                    IMESentenceMode =3
+                    Left =6600
+                    Top =240
+                    Width =5040
+                    Height =330
+                    TabIndex =1
+                    BorderColor =10921638
+                    ForeColor =4210752
+                    Name ="Text6"
+                    ControlSource ="=\"Page \" & [Page] & \" of \" & [Pages]"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+
+                    LayoutCachedLeft =6600
+                    LayoutCachedTop =240
+                    LayoutCachedWidth =11640
+                    LayoutCachedHeight =570
+                End
+            End
+        End
+        Begin FormFooter
+            KeepTogether = NotDefault
+            Height =0
+            Name ="ReportFooter"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit
diff --git a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
new file mode 100644
index 00000000..5c540100
--- /dev/null
+++ b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
@@ -0,0 +1,98 @@
+Version =20
+VersionRequired =20
+Begin Report
+    LayoutForPrint = NotDefault
+    DividingLines = NotDefault
+    AllowDesignChanges = NotDefault
+    DateGrouping =1
+    GrpKeepTogether =1
+    PictureAlignment =2
+    DatasheetGridlinesBehavior =3
+    GridX =24
+    GridY =24
+    Width =8884
+    DatasheetFontHeight =11
+    ItemSuffix =1
+    RecSrcDt = Begin
+        0xe05ff061b477e540
+    End
+    DatasheetFontName ="Franklin Gothic Book"
+    FilterOnLoad =0
+    FitToPage =1
+    DisplayOnSharePointSite =1
+    DatasheetAlternateBackColor =15921906
+    DatasheetGridlinesColor12 =0
+    FitToScreen =1
+    DatasheetBackThemeColorIndex =1
+    BorderThemeColorIndex =3
+    ThemeFontIndex =1
+    ForeThemeColorIndex =0
+    AlternateBackThemeColorIndex =1
+    AlternateBackShade =95.0
+    Begin
+        Begin Label
+            BackStyle =0
+            FontSize =11
+            FontName ="Calibri"
+            ThemeFontIndex =1
+            BackThemeColorIndex =1
+            BorderThemeColorIndex =0
+            BorderTint =50.0
+            ForeThemeColorIndex =0
+            ForeTint =50.0
+            GridlineThemeColorIndex =1
+            GridlineShade =65.0
+        End
+        Begin PageHeader
+            Height =360
+            Name ="PageHeaderSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+        Begin Section
+            KeepTogether = NotDefault
+            Height =7560
+            Name ="Detail"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+            Begin
+                Begin Label
+                    TextFontFamily =0
+                    Left =1260
+                    Top =240
+                    Width =4800
+                    Height =420
+                    BorderColor =8355711
+                    ForeColor =8355711
+                    Name ="Label0"
+                    Caption ="This report uses A4 landscape paper size"
+                    FontName ="Franklin Gothic Book"
+                    GridlineColor =10921638
+                    LayoutCachedLeft =1260
+                    LayoutCachedTop =240
+                    LayoutCachedWidth =6060
+                    LayoutCachedHeight =660
+                End
+            End
+        End
+        Begin PageFooter
+            Height =360
+            Name ="PageFooterSection"
+            AutoHeight =1
+            AlternateBackThemeColorIndex =1
+            AlternateBackShade =95.0
+            BackThemeColorIndex =1
+        End
+    End
+End
+CodeBehindForm
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit

From 68e01a75119bbca58fabb542cbc1edfdb6f6f83b Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 09:25:32 -0600
Subject: [PATCH 51/73] Split layout from VBA in testing database

Separates the VBA code from the layout definition in the source files. (Applying to testing database now, will apply to main project soon.)
---
 Testing/Testing.accdb.src/forms/frmColors.bas |   7 +-
 Testing/Testing.accdb.src/forms/frmColors.cls | 940 +-----------------
 .../forms/frmExtendedChars.bas                | 531 +---------
 .../forms/frmExtendedChars.cls                |  97 +-
 Testing/Testing.accdb.src/forms/frmMain.bas   | 259 +----
 Testing/Testing.accdb.src/forms/frmMain.cls   | 368 +------
 .../reports/rptDefaultPrinter.bas             |   7 +-
 .../reports/rptDefaultPrinter.cls             |  95 +-
 .../reports/rptNavigationPaneGroups.bas       |   7 +-
 .../reports/rptNavigationPaneGroups.cls       | 282 +-----
 .../reports/rptNonDefaultPaperSize.bas        |   7 +-
 .../reports/rptNonDefaultPaperSize.cls        |  94 +-
 Testing/Testing.accdb.src/vcs-options.json    |   3 +-
 13 files changed, 14 insertions(+), 2683 deletions(-)

diff --git a/Testing/Testing.accdb.src/forms/frmColors.bas b/Testing/Testing.accdb.src/forms/frmColors.bas
index 0452bc76..4894b2d4 100644
--- a/Testing/Testing.accdb.src/forms/frmColors.bas
+++ b/Testing/Testing.accdb.src/forms/frmColors.bas
@@ -936,9 +936,4 @@ Begin Form
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
+' See "frmColors.cls"
diff --git a/Testing/Testing.accdb.src/forms/frmColors.cls b/Testing/Testing.accdb.src/forms/frmColors.cls
index 0452bc76..88b9322e 100644
--- a/Testing/Testing.accdb.src/forms/frmColors.cls
+++ b/Testing/Testing.accdb.src/forms/frmColors.cls
@@ -1,942 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Form
-    RecordSelectors = NotDefault
-    NavigationButtons = NotDefault
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    DefaultView =0
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =14400
-    DatasheetFontHeight =11
-    ItemSuffix =50
-    Right =19650
-    Bottom =12585
-    RecSrcDt = Begin
-        0x8b5c5de351a8e540
-    End
-    DatasheetFontName ="Franklin Gothic Book"
-    AllowDatasheetView =0
-    FilterOnLoad =0
-    ShowPageMargins =0
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Rectangle
-            SpecialEffect =3
-            BackStyle =0
-            BorderLineStyle =0
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Line
-            BorderLineStyle =0
-            BorderThemeColorIndex =0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Image
-            BackStyle =0
-            OldBorderStyle =0
-            BorderLineStyle =0
-            SizeMode =3
-            PictureAlignment =2
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin CommandButton
-            FontSize =11
-            FontWeight =400
-            FontName ="Calibri"
-            ForeThemeColorIndex =0
-            ForeTint =75.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-            UseTheme =1
-            Shape =1
-            Gradient =12
-            BackThemeColorIndex =4
-            BackTint =60.0
-            BorderLineStyle =0
-            BorderThemeColorIndex =4
-            BorderTint =60.0
-            ThemeFontIndex =1
-            HoverThemeColorIndex =4
-            HoverTint =40.0
-            PressedThemeColorIndex =4
-            PressedShade =75.0
-            HoverForeThemeColorIndex =0
-            HoverForeTint =75.0
-            PressedForeThemeColorIndex =0
-            PressedForeTint =75.0
-        End
-        Begin TextBox
-            AddColon = NotDefault
-            FELineBreak = NotDefault
-            BorderLineStyle =0
-            LabelX =-1800
-            FontSize =11
-            FontName ="Calibri"
-            AsianLineBreak =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            ThemeFontIndex =1
-            ForeThemeColorIndex =0
-            ForeTint =75.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin UnboundObjectFrame
-            SpecialEffect =2
-            OldBorderStyle =1
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            ForeThemeColorIndex =2
-            ForeShade =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin FormHeader
-            Height =780
-            Name ="FormHeader"
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =2
-            BackTint =20.0
-        End
-        Begin Section
-            Height =7050
-            Name ="Detail"
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =2880
-                    Top =1620
-                    Width =840
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label0"
-                    Caption ="Type"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =2880
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =3720
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Line
-                    OverlapFlags =85
-                    Left =480
-                    Top =2100
-                    Width =12540
-                    Name ="Line1"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =480
-                    LayoutCachedTop =2100
-                    LayoutCachedWidth =13020
-                    LayoutCachedHeight =2100
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =4320
-                    Top =1620
-                    Width =1260
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label3"
-                    Caption ="Theme Color"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =4320
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =5580
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =93
-                    TextFontFamily =0
-                    Left =7200
-                    Top =1620
-                    Width =1440
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label4"
-                    Caption ="Pallet Color"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =7200
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =8640
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =93
-                    TextFontFamily =0
-                    Left =10080
-                    Top =1620
-                    Width =1305
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label5"
-                    Caption ="Default Color"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =10080
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =11385
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =2880
-                    Top =2280
-                    Width =870
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label6"
-                    Caption ="Text Box"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =2880
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =3750
-                    LayoutCachedHeight =2640
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =2880
-                    Top =2820
-                    Width =870
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label7"
-                    Caption ="Label"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =2880
-                    LayoutCachedTop =2820
-                    LayoutCachedWidth =3750
-                    LayoutCachedHeight =3180
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =2880
-                    Top =3300
-                    Width =870
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label8"
-                    Caption ="Button"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =2880
-                    LayoutCachedTop =3300
-                    LayoutCachedWidth =3750
-                    LayoutCachedHeight =3660
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =2880
-                    Top =3780
-                    Width =870
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label9"
-                    Caption ="Box"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =2880
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =3750
-                    LayoutCachedHeight =4140
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =600
-                    Top =2280
-                    Width =1635
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label12"
-                    Caption ="Orange, Accent 2"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =600
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =2235
-                    LayoutCachedHeight =2640
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =4320
-                    Top =2280
-                    Width =1200
-                    Height =315
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text13"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =4320
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =5520
-                    LayoutCachedHeight =2595
-                    BackThemeColorIndex =5
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =7200
-                    Top =2280
-                    Width =1200
-                    Height =315
-                    TabIndex =1
-                    BackColor =5676533
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text15"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =7200
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =8400
-                    LayoutCachedHeight =2595
-                    BackThemeColorIndex =-1
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =8640
-                    Top =2280
-                    Width =1200
-                    Height =315
-                    TabIndex =2
-                    BackColor =3439082
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text16"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =8640
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =9840
-                    LayoutCachedHeight =2595
-                    BackThemeColorIndex =-1
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =11520
-                    Top =2280
-                    Width =1200
-                    Height =315
-                    TabIndex =3
-                    BackColor =-2147483598
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text18"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =11520
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =12720
-                    LayoutCachedHeight =2595
-                    BackThemeColorIndex =-1
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =11520
-                    Top =1620
-                    Width =1305
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label19"
-                    Caption ="System Color"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =11520
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =12825
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    OverlapFlags =87
-                    TextFontFamily =0
-                    Left =8640
-                    Top =1620
-                    Width =1440
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label20"
-                    Caption ="Custom Color"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =8640
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =10080
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    BackStyle =1
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =4320
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label21"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =4320
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =5520
-                    LayoutCachedHeight =3060
-                    BackThemeColorIndex =5
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =10080
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label22"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =10080
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =11280
-                    LayoutCachedHeight =3060
-                End
-                Begin Label
-                    BackStyle =1
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =7200
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BackColor =5676533
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label23"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =7200
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =8400
-                    LayoutCachedHeight =3060
-                    BackThemeColorIndex =-1
-                End
-                Begin Label
-                    BackStyle =1
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =8640
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BackColor =3439082
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label24"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =8640
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =9840
-                    LayoutCachedHeight =3060
-                    BackThemeColorIndex =-1
-                End
-                Begin Label
-                    BackStyle =1
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =11520
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BackColor =-2147483598
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label25"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =11520
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =12720
-                    LayoutCachedHeight =3060
-                    BackThemeColorIndex =-1
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =10080
-                    Top =2280
-                    Width =1260
-                    Height =315
-                    TabIndex =4
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text28"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =10080
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =11340
-                    LayoutCachedHeight =2595
-                End
-                Begin TextBox
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =5760
-                    Top =2280
-                    Width =1200
-                    Height =315
-                    TabIndex =5
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text30"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =5760
-                    LayoutCachedTop =2280
-                    LayoutCachedWidth =6960
-                    LayoutCachedHeight =2595
-                    BackThemeColorIndex =5
-                    BackTint =60.0
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =5760
-                    Top =1620
-                    Width =1260
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label31"
-                    Caption ="Shade"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =5760
-                    LayoutCachedTop =1620
-                    LayoutCachedWidth =7020
-                    LayoutCachedHeight =1980
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Label
-                    BackStyle =1
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =5760
-                    Top =2760
-                    Width =1200
-                    Height =300
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label32"
-                    Caption =" "
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =5760
-                    LayoutCachedTop =2760
-                    LayoutCachedWidth =6960
-                    LayoutCachedHeight =3060
-                    BackThemeColorIndex =5
-                    BackTint =60.0
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =4320
-                    Top =3240
-                    Width =1200
-                    TabIndex =6
-                    ForeColor =4210752
-                    Name ="Command33"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =4320
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =5520
-                    LayoutCachedHeight =3600
-                    Gradient =0
-                    BackThemeColorIndex =5
-                    BackTint =100.0
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =5760
-                    Top =3240
-                    Width =1200
-                    TabIndex =7
-                    ForeColor =4210752
-                    Name ="Command34"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =5760
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =6960
-                    LayoutCachedHeight =3600
-                    Gradient =0
-                    BackThemeColorIndex =5
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =7200
-                    Top =3240
-                    Width =1200
-                    TabIndex =8
-                    ForeColor =4210752
-                    Name ="Command35"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =7200
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =8400
-                    LayoutCachedHeight =3600
-                    Gradient =0
-                    BackColor =5676533
-                    BackThemeColorIndex =-1
-                    BackTint =100.0
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =8640
-                    Top =3240
-                    Width =1200
-                    TabIndex =9
-                    ForeColor =4210752
-                    Name ="Command36"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =8640
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =9840
-                    LayoutCachedHeight =3600
-                    Gradient =0
-                    BackColor =3439082
-                    BackThemeColorIndex =-1
-                    BackTint =100.0
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =10080
-                    Top =3240
-                    Width =1200
-                    TabIndex =10
-                    ForeColor =4210752
-                    Name ="Command37"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =10080
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =11280
-                    LayoutCachedHeight =3600
-                    BackColor =11710639
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =11520
-                    Top =3240
-                    Width =1200
-                    TabIndex =11
-                    ForeColor =4210752
-                    Name ="Command38"
-                    Caption ="Command33"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =11520
-                    LayoutCachedTop =3240
-                    LayoutCachedWidth =12720
-                    LayoutCachedHeight =3600
-                    Gradient =0
-                    BackColor =-2147483598
-                    BackThemeColorIndex =-1
-                    BackTint =100.0
-                    BorderColor =11710639
-                    HoverColor =13355721
-                    PressedColor =6249563
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                End
-                Begin Rectangle
-                    BackStyle =1
-                    OverlapFlags =85
-                    Left =4320
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BorderColor =10921638
-                    Name ="Box41"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =4320
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =5520
-                    LayoutCachedHeight =4140
-                    BackThemeColorIndex =5
-                End
-                Begin Rectangle
-                    BackStyle =1
-                    OverlapFlags =85
-                    Left =5760
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BorderColor =10921638
-                    Name ="Box42"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =5760
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =6960
-                    LayoutCachedHeight =4140
-                    BackThemeColorIndex =5
-                    BackTint =60.0
-                End
-                Begin Rectangle
-                    BackStyle =1
-                    OverlapFlags =85
-                    Left =7200
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BackColor =5676533
-                    BorderColor =10921638
-                    Name ="Box43"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =7200
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =8400
-                    LayoutCachedHeight =4140
-                    BackThemeColorIndex =-1
-                End
-                Begin Rectangle
-                    BackStyle =1
-                    OverlapFlags =85
-                    Left =8640
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BackColor =3439082
-                    BorderColor =10921638
-                    Name ="Box44"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =8640
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =9840
-                    LayoutCachedHeight =4140
-                    BackThemeColorIndex =-1
-                End
-                Begin Rectangle
-                    OverlapFlags =85
-                    Left =10080
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BorderColor =10921638
-                    Name ="Box45"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =10080
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =11280
-                    LayoutCachedHeight =4140
-                End
-                Begin Rectangle
-                    BackStyle =1
-                    OverlapFlags =85
-                    Left =11520
-                    Top =3780
-                    Width =1200
-                    Height =360
-                    BackColor =-2147483598
-                    BorderColor =10921638
-                    Name ="Box46"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =11520
-                    LayoutCachedTop =3780
-                    LayoutCachedWidth =12720
-                    LayoutCachedHeight =4140
-                    BackThemeColorIndex =-1
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =0
-                    Left =600
-                    Top =4860
-                    Width =1860
-                    Height =360
-                    BorderColor =8355711
-                    Name ="Label48"
-                    Caption ="Screenshot Image"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =600
-                    LayoutCachedTop =4860
-                    LayoutCachedWidth =2460
-                    LayoutCachedHeight =5220
-                    ForeThemeColorIndex =-1
-                    ForeTint =100.0
-                End
-                Begin Image
-                    PictureType =2
-                    Left =2760
-                    Top =4620
-                    Width =10245
-                    Height =2190
-                    BorderColor =10921638
-                    Name ="Image49"
-                    Picture ="Colors"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =2760
-                    LayoutCachedTop =4620
-                    LayoutCachedWidth =13005
-                    LayoutCachedHeight =6810
-                    TabIndex =12
-                End
-            End
-        End
-        Begin FormFooter
-            Height =660
-            Name ="FormFooter"
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/forms/frmExtendedChars.bas b/Testing/Testing.accdb.src/forms/frmExtendedChars.bas
index b366db29..a165e652 100644
--- a/Testing/Testing.accdb.src/forms/frmExtendedChars.bas
+++ b/Testing/Testing.accdb.src/forms/frmExtendedChars.bas
@@ -93,533 +93,4 @@ Begin Form
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
-
-
-'——————————————————————————————————————————————————————————————————————————————————————————¬
-' This module is used to prove that all ASCII characters survive the export\import cycle.  |
-'——————————————————————————————————————————————————————————————————————————————————————————+
-
-' ASCII Table Using Windows-1252 codepage
-'  Table generated using https://ozh.github.io/ascii-tables/
-'
-' +=====+=====+==========+=======+
-' | Dec | Hex |  Binary  | Char  |
-' +=====+=====+==========+=======+
-' |   0 | 00  | 00000000 | NUL   |
-' +-----+-----+----------+-------+
-' |   1 | 01  | 00000001 | SOH   |
-' +-----+-----+----------+-------+
-' |   2 | 02  | 00000010 | STX   |
-' +-----+-----+----------+-------+
-' |   3 | 03  | 00000011 | ETX   |
-' +-----+-----+----------+-------+
-' |   4 | 04  | 00000100 | EOT   |
-' +-----+-----+----------+-------+
-' |   5 | 05  | 00000101 | ENQ   |
-' +-----+-----+----------+-------+
-' |   6 | 06  | 00000110 | ACK   |
-' +-----+-----+----------+-------+
-' |   7 | 07  | 00000111 | BEL   |
-' +-----+-----+----------+-------+
-' |   8 | 08  | 00001000 | BS    |
-' +-----+-----+----------+-------+
-' |   9 | 09  | 00001001 | HT    |
-' +-----+-----+----------+-------+
-' |  10 | 0A  | 00001010 | LF    |
-' +-----+-----+----------+-------+
-' |  11 | 0B  | 00001011 | VT    |
-' +-----+-----+----------+-------+
-' |  12 | 0C  | 00001100 | FF    |
-' +-----+-----+----------+-------+
-' |  13 | 0D  | 00001101 | CR    |
-' +-----+-----+----------+-------+
-' |  14 | 0E  | 00001110 | SO    |
-' +-----+-----+----------+-------+
-' |  15 | 0F  | 00001111 | SI    |
-' +-----+-----+----------+-------+
-' |  16 | 10  | 00010000 | DLE   |
-' +-----+-----+----------+-------+
-' |  17 | 11  | 00010001 | DC1   |
-' +-----+-----+----------+-------+
-' |  18 | 12  | 00010010 | DC2   |
-' +-----+-----+----------+-------+
-' |  19 | 13  | 00010011 | DC3   |
-' +-----+-----+----------+-------+
-' |  20 | 14  | 00010100 | DC4   |
-' +-----+-----+----------+-------+
-' |  21 | 15  | 00010101 | NAK   |
-' +-----+-----+----------+-------+
-' |  22 | 16  | 00010110 | SYN   |
-' +-----+-----+----------+-------+
-' |  23 | 17  | 00010111 | ETB   |
-' +-----+-----+----------+-------+
-' |  24 | 18  | 00011000 | CAN   |
-' +-----+-----+----------+-------+
-' |  25 | 19  | 00011001 | EM    |
-' +-----+-----+----------+-------+
-' |  26 | 1A  | 00011010 | SUB   |
-' +-----+-----+----------+-------+
-' |  27 | 1B  | 00011011 | ESC   |
-' +-----+-----+----------+-------+
-' |  28 | 1C  | 00011100 | FS    |
-' +-----+-----+----------+-------+
-' |  29 | 1D  | 00011101 | GS    |
-' +-----+-----+----------+-------+
-' |  30 | 1E  | 00011110 | RS    |
-' +-----+-----+----------+-------+
-' |  31 | 1F  | 00011111 | US    |
-' +-----+-----+----------+-------+
-' |  32 | 20  | 00100000 | space |
-' +-----+-----+----------+-------+
-' |  33 | 21  | 00100001 | !     |
-' +-----+-----+----------+-------+
-' |  34 | 22  | 00100010 | "     |
-' +-----+-----+----------+-------+
-' |  35 | 23  | 00100011 | #     |
-' +-----+-----+----------+-------+
-' |  36 | 24  | 00100100 | $     |
-' +-----+-----+----------+-------+
-' |  37 | 25  | 00100101 | %     |
-' +-----+-----+----------+-------+
-' |  38 | 26  | 00100110 | &     |
-' +-----+-----+----------+-------+
-' |  39 | 27  | 00100111 | '     |
-' +-----+-----+----------+-------+
-' |  40 | 28  | 00101000 | (     |
-' +-----+-----+----------+-------+
-' |  41 | 29  | 00101001 | )     |
-' +-----+-----+----------+-------+
-' |  42 | 2A  | 00101010 | *     |
-' +-----+-----+----------+-------+
-' |  43 | 2B  | 00101011 | +     |
-' +-----+-----+----------+-------+
-' |  44 | 2C  | 00101100 | ,     |
-' +-----+-----+----------+-------+
-' |  45 | 2D  | 00101101 | -     |
-' +-----+-----+----------+-------+
-' |  46 | 2E  | 00101110 | .     |
-' +-----+-----+----------+-------+
-' |  47 | 2F  | 00101111 | /     |
-' +-----+-----+----------+-------+
-' |  48 | 30  | 00110000 | 0     |
-' +-----+-----+----------+-------+
-' |  49 | 31  | 00110001 | 1     |
-' +-----+-----+----------+-------+
-' |  50 | 32  | 00110010 | 2     |
-' +-----+-----+----------+-------+
-' |  51 | 33  | 00110011 | 3     |
-' +-----+-----+----------+-------+
-' |  52 | 34  | 00110100 | 4     |
-' +-----+-----+----------+-------+
-' |  53 | 35  | 00110101 | 5     |
-' +-----+-----+----------+-------+
-' |  54 | 36  | 00110110 | 6     |
-' +-----+-----+----------+-------+
-' |  55 | 37  | 00110111 | 7     |
-' +-----+-----+----------+-------+
-' |  56 | 38  | 00111000 | 8     |
-' +-----+-----+----------+-------+
-' |  57 | 39  | 00111001 | 9     |
-' +-----+-----+----------+-------+
-' |  58 | 3A  | 00111010 | :     |
-' +-----+-----+----------+-------+
-' |  59 | 3B  | 00111011 | ;     |
-' +-----+-----+----------+-------+
-' |  60 | 3C  | 00111100 | <     |
-' +-----+-----+----------+-------+
-' |  61 | 3D  | 00111101 | =     |
-' +-----+-----+----------+-------+
-' |  62 | 3E  | 00111110 | >     |
-' +-----+-----+----------+-------+
-' |  63 | 3F  | 00111111 | ?     |
-' +-----+-----+----------+-------+
-' |  64 | 40  | 01000000 | @     |
-' +-----+-----+----------+-------+
-' |  65 | 41  | 01000001 | A     |
-' +-----+-----+----------+-------+
-' |  66 | 42  | 01000010 | B     |
-' +-----+-----+----------+-------+
-' |  67 | 43  | 01000011 | C     |
-' +-----+-----+----------+-------+
-' |  68 | 44  | 01000100 | D     |
-' +-----+-----+----------+-------+
-' |  69 | 45  | 01000101 | E     |
-' +-----+-----+----------+-------+
-' |  70 | 46  | 01000110 | F     |
-' +-----+-----+----------+-------+
-' |  71 | 47  | 01000111 | G     |
-' +-----+-----+----------+-------+
-' |  72 | 48  | 01001000 | H     |
-' +-----+-----+----------+-------+
-' |  73 | 49  | 01001001 | I     |
-' +-----+-----+----------+-------+
-' |  74 | 4A  | 01001010 | J     |
-' +-----+-----+----------+-------+
-' |  75 | 4B  | 01001011 | K     |
-' +-----+-----+----------+-------+
-' |  76 | 4C  | 01001100 | L     |
-' +-----+-----+----------+-------+
-' |  77 | 4D  | 01001101 | M     |
-' +-----+-----+----------+-------+
-' |  78 | 4E  | 01001110 | N     |
-' +-----+-----+----------+-------+
-' |  79 | 4F  | 01001111 | O     |
-' +-----+-----+----------+-------+
-' |  80 | 50  | 01010000 | P     |
-' +-----+-----+----------+-------+
-' |  81 | 51  | 01010001 | Q     |
-' +-----+-----+----------+-------+
-' |  82 | 52  | 01010010 | R     |
-' +-----+-----+----------+-------+
-' |  83 | 53  | 01010011 | S     |
-' +-----+-----+----------+-------+
-' |  84 | 54  | 01010100 | T     |
-' +-----+-----+----------+-------+
-' |  85 | 55  | 01010101 | U     |
-' +-----+-----+----------+-------+
-' |  86 | 56  | 01010110 | V     |
-' +-----+-----+----------+-------+
-' |  87 | 57  | 01010111 | W     |
-' +-----+-----+----------+-------+
-' |  88 | 58  | 01011000 | X     |
-' +-----+-----+----------+-------+
-' |  89 | 59  | 01011001 | Y     |
-' +-----+-----+----------+-------+
-' |  90 | 5A  | 01011010 | Z     |
-' +-----+-----+----------+-------+
-' |  91 | 5B  | 01011011 | [     |
-' +-----+-----+----------+-------+
-' |  92 | 5C  | 01011100 | \     |
-' +-----+-----+----------+-------+
-' |  93 | 5D  | 01011101 | ]     |
-' +-----+-----+----------+-------+
-' |  94 | 5E  | 01011110 | ^     |
-' +-----+-----+----------+-------+
-' |  95 | 5F  | 01011111 | _     |
-' +-----+-----+----------+-------+
-' |  96 | 60  | 01100000 | `     |
-' +-----+-----+----------+-------+
-' |  97 | 61  | 01100001 | a     |
-' +-----+-----+----------+-------+
-' |  98 | 62  | 01100010 | b     |
-' +-----+-----+----------+-------+
-' |  99 | 63  | 01100011 | c     |
-' +-----+-----+----------+-------+
-' | 100 | 64  | 01100100 | d     |
-' +-----+-----+----------+-------+
-' | 101 | 65  | 01100101 | e     |
-' +-----+-----+----------+-------+
-' | 102 | 66  | 01100110 | f     |
-' +-----+-----+----------+-------+
-' | 103 | 67  | 01100111 | g     |
-' +-----+-----+----------+-------+
-' | 104 | 68  | 01101000 | h     |
-' +-----+-----+----------+-------+
-' | 105 | 69  | 01101001 | i     |
-' +-----+-----+----------+-------+
-' | 106 | 6A  | 01101010 | j     |
-' +-----+-----+----------+-------+
-' | 107 | 6B  | 01101011 | k     |
-' +-----+-----+----------+-------+
-' | 108 | 6C  | 01101100 | l     |
-' +-----+-----+----------+-------+
-' | 109 | 6D  | 01101101 | m     |
-' +-----+-----+----------+-------+
-' | 110 | 6E  | 01101110 | n     |
-' +-----+-----+----------+-------+
-' | 111 | 6F  | 01101111 | o     |
-' +-----+-----+----------+-------+
-' | 112 | 70  | 01110000 | p     |
-' +-----+-----+----------+-------+
-' | 113 | 71  | 01110001 | q     |
-' +-----+-----+----------+-------+
-' | 114 | 72  | 01110010 | r     |
-' +-----+-----+----------+-------+
-' | 115 | 73  | 01110011 | s     |
-' +-----+-----+----------+-------+
-' | 116 | 74  | 01110100 | t     |
-' +-----+-----+----------+-------+
-' | 117 | 75  | 01110101 | u     |
-' +-----+-----+----------+-------+
-' | 118 | 76  | 01110110 | v     |
-' +-----+-----+----------+-------+
-' | 119 | 77  | 01110111 | w     |
-' +-----+-----+----------+-------+
-' | 120 | 78  | 01111000 | x     |
-' +-----+-----+----------+-------+
-' | 121 | 79  | 01111001 | y     |
-' +-----+-----+----------+-------+
-' | 122 | 7A  | 01111010 | z     |
-' +-----+-----+----------+-------+
-' | 123 | 7B  | 01111011 | {     |
-' +-----+-----+----------+-------+
-' | 124 | 7C  | 01111100 | |     |
-' +-----+-----+----------+-------+
-' | 125 | 7D  | 01111101 | }     |
-' +-----+-----+----------+-------+
-' | 126 | 7E  | 01111110 | ~     |
-' +-----+-----+----------+-------+
-' | 127 | 7F  | 01111111 | DEL   |
-' +-----+-----+----------+-------+
-' | 128 | 80  | 10000000 | €     |
-' +-----+-----+----------+-------+
-' | 129 | 81  | 10000001 |       |
-' +-----+-----+----------+-------+
-' | 130 | 82  | 10000010 | ‚     |
-' +-----+-----+----------+-------+
-' | 131 | 83  | 10000011 | ƒ     |
-' +-----+-----+----------+-------+
-' | 132 | 84  | 10000100 | „     |
-' +-----+-----+----------+-------+
-' | 133 | 85  | 10000101 | …     |
-' +-----+-----+----------+-------+
-' | 134 | 86  | 10000110 | †     |
-' +-----+-----+----------+-------+
-' | 135 | 87  | 10000111 | ‡     |
-' +-----+-----+----------+-------+
-' | 136 | 88  | 10001000 | ˆ     |
-' +-----+-----+----------+-------+
-' | 137 | 89  | 10001001 | ‰     |
-' +-----+-----+----------+-------+
-' | 138 | 8A  | 10001010 | Š     |
-' +-----+-----+----------+-------+
-' | 139 | 8B  | 10001011 | ‹     |
-' +-----+-----+----------+-------+
-' | 140 | 8C  | 10001100 | Π    |
-' +-----+-----+----------+-------+
-' | 141 | 8D  | 10001101 |       |
-' +-----+-----+----------+-------+
-' | 142 | 8E  | 10001110 | Ž     |
-' +-----+-----+----------+-------+
-' | 143 | 8F  | 10001111 |       |
-' +-----+-----+----------+-------+
-' | 144 | 90  | 10010000 |       |
-' +-----+-----+----------+-------+
-' | 145 | 91  | 10010001 | ‘     |
-' +-----+-----+----------+-------+
-' | 146 | 92  | 10010010 | ’     |
-' +-----+-----+----------+-------+
-' | 147 | 93  | 10010011 | “     |
-' +-----+-----+----------+-------+
-' | 148 | 94  | 10010100 | ”     |
-' +-----+-----+----------+-------+
-' | 149 | 95  | 10010101 | •     |
-' +-----+-----+----------+-------+
-' | 150 | 96  | 10010110 | –     |
-' +-----+-----+----------+-------+
-' | 151 | 97  | 10010111 | —     |
-' +-----+-----+----------+-------+
-' | 152 | 98  | 10011000 | ˜      |
-' +-----+-----+----------+-------+
-' | 153 | 99  | 10011001 | ™     |
-' +-----+-----+----------+-------+
-' | 154 | 9A  | 10011010 | š     |
-' +-----+-----+----------+-------+
-' | 155 | 9B  | 10011011 | ›     |
-' +-----+-----+----------+-------+
-' | 156 | 9C  | 10011100 | œ     |
-' +-----+-----+----------+-------+
-' | 157 | 9D  | 10011101 |       |
-' +-----+-----+----------+-------+
-' | 158 | 9E  | 10011110 | ž     |
-' +-----+-----+----------+-------+
-' | 159 | 9F  | 10011111 | Ÿ     |
-' +-----+-----+----------+-------+
-' | 160 | A0  | 10100000 |       |
-' +-----+-----+----------+-------+
-' | 161 | A1  | 10100001 | ¡     |
-' +-----+-----+----------+-------+
-' | 162 | A2  | 10100010 | ¢     |
-' +-----+-----+----------+-------+
-' | 163 | A3  | 10100011 | £     |
-' +-----+-----+----------+-------+
-' | 164 | A4  | 10100100 | ¤     |
-' +-----+-----+----------+-------+
-' | 165 | A5  | 10100101 | ¥     |
-' +-----+-----+----------+-------+
-' | 166 | A6  | 10100110 | ¦     |
-' +-----+-----+----------+-------+
-' | 167 | A7  | 10100111 | §     |
-' +-----+-----+----------+-------+
-' | 168 | A8  | 10101000 | ¨     |
-' +-----+-----+----------+-------+
-' | 169 | A9  | 10101001 | ©     |
-' +-----+-----+----------+-------+
-' | 170 | AA  | 10101010 | ª     |
-' +-----+-----+----------+-------+
-' | 171 | AB  | 10101011 | «     |
-' +-----+-----+----------+-------+
-' | 172 | AC  | 10101100 | ¬     |
-' +-----+-----+----------+-------+
-' | 173 | AD  | 10101101 | ­     |
-' +-----+-----+----------+-------+
-' | 174 | AE  | 10101110 | ®     |
-' +-----+-----+----------+-------+
-' | 175 | AF  | 10101111 | ¯     |
-' +-----+-----+----------+-------+
-' | 176 | B0  | 10110000 | °     |
-' +-----+-----+----------+-------+
-' | 177 | B1  | 10110001 | ±     |
-' +-----+-----+----------+-------+
-' | 178 | B2  | 10110010 | ²     |
-' +-----+-----+----------+-------+
-' | 179 | B3  | 10110011 | ³     |
-' +-----+-----+----------+-------+
-' | 180 | B4  | 10110100 | ´     |
-' +-----+-----+----------+-------+
-' | 181 | B5  | 10110101 | µ     |
-' +-----+-----+----------+-------+
-' | 182 | B6  | 10110110 | ¶     |
-' +-----+-----+----------+-------+
-' | 183 | B7  | 10110111 | ·     |
-' +-----+-----+----------+-------+
-' | 184 | B8  | 10111000 | ¸     |
-' +-----+-----+----------+-------+
-' | 185 | B9  | 10111001 | ¹     |
-' +-----+-----+----------+-------+
-' | 186 | BA  | 10111010 | º     |
-' +-----+-----+----------+-------+
-' | 187 | BB  | 10111011 | »     |
-' +-----+-----+----------+-------+
-' | 188 | BC  | 10111100 | ¼     |
-' +-----+-----+----------+-------+
-' | 189 | BD  | 10111101 | ½     |
-' +-----+-----+----------+-------+
-' | 190 | BE  | 10111110 | ¾     |
-' +-----+-----+----------+-------+
-' | 191 | BF  | 10111111 | ¿     |
-' +-----+-----+----------+-------+
-' | 192 | C0  | 11000000 | À     |
-' +-----+-----+----------+-------+
-' | 193 | C1  | 11000001 | Á     |
-' +-----+-----+----------+-------+
-' | 194 | C2  | 11000010 | Â     |
-' +-----+-----+----------+-------+
-' | 195 | C3  | 11000011 | Ã     |
-' +-----+-----+----------+-------+
-' | 196 | C4  | 11000100 | Ä     |
-' +-----+-----+----------+-------+
-' | 197 | C5  | 11000101 | Å     |
-' +-----+-----+----------+-------+
-' | 198 | C6  | 11000110 | Æ     |
-' +-----+-----+----------+-------+
-' | 199 | C7  | 11000111 | Ç     |
-' +-----+-----+----------+-------+
-' | 200 | C8  | 11001000 | È     |
-' +-----+-----+----------+-------+
-' | 201 | C9  | 11001001 | É     |
-' +-----+-----+----------+-------+
-' | 202 | CA  | 11001010 | Ê     |
-' +-----+-----+----------+-------+
-' | 203 | CB  | 11001011 | Ë     |
-' +-----+-----+----------+-------+
-' | 204 | CC  | 11001100 | Ì     |
-' +-----+-----+----------+-------+
-' | 205 | CD  | 11001101 | Í     |
-' +-----+-----+----------+-------+
-' | 206 | CE  | 11001110 | Î     |
-' +-----+-----+----------+-------+
-' | 207 | CF  | 11001111 | Ï     |
-' +-----+-----+----------+-------+
-' | 208 | D0  | 11010000 | Ð     |
-' +-----+-----+----------+-------+
-' | 209 | D1  | 11010001 | Ñ     |
-' +-----+-----+----------+-------+
-' | 210 | D2  | 11010010 | Ò     |
-' +-----+-----+----------+-------+
-' | 211 | D3  | 11010011 | Ó     |
-' +-----+-----+----------+-------+
-' | 212 | D4  | 11010100 | Ô     |
-' +-----+-----+----------+-------+
-' | 213 | D5  | 11010101 | Õ     |
-' +-----+-----+----------+-------+
-' | 214 | D6  | 11010110 | Ö     |
-' +-----+-----+----------+-------+
-' | 215 | D7  | 11010111 | ×     |
-' +-----+-----+----------+-------+
-' | 216 | D8  | 11011000 | Ø     |
-' +-----+-----+----------+-------+
-' | 217 | D9  | 11011001 | Ù     |
-' +-----+-----+----------+-------+
-' | 218 | DA  | 11011010 | Ú     |
-' +-----+-----+----------+-------+
-' | 219 | DB  | 11011011 | Û     |
-' +-----+-----+----------+-------+
-' | 220 | DC  | 11011100 | Ü     |
-' +-----+-----+----------+-------+
-' | 221 | DD  | 11011101 | Ý     |
-' +-----+-----+----------+-------+
-' | 222 | DE  | 11011110 | Þ     |
-' +-----+-----+----------+-------+
-' | 223 | DF  | 11011111 | ß     |
-' +-----+-----+----------+-------+
-' | 224 | E0  | 11100000 | à     |
-' +-----+-----+----------+-------+
-' | 225 | E1  | 11100001 | á     |
-' +-----+-----+----------+-------+
-' | 226 | E2  | 11100010 | â     |
-' +-----+-----+----------+-------+
-' | 227 | E3  | 11100011 | ã     |
-' +-----+-----+----------+-------+
-' | 228 | E4  | 11100100 | ä     |
-' +-----+-----+----------+-------+
-' | 229 | E5  | 11100101 | å     |
-' +-----+-----+----------+-------+
-' | 230 | E6  | 11100110 | æ     |
-' +-----+-----+----------+-------+
-' | 231 | E7  | 11100111 | ç     |
-' +-----+-----+----------+-------+
-' | 232 | E8  | 11101000 | è     |
-' +-----+-----+----------+-------+
-' | 233 | E9  | 11101001 | é     |
-' +-----+-----+----------+-------+
-' | 234 | EA  | 11101010 | ê     |
-' +-----+-----+----------+-------+
-' | 235 | EB  | 11101011 | ë     |
-' +-----+-----+----------+-------+
-' | 236 | EC  | 11101100 | ì     |
-' +-----+-----+----------+-------+
-' | 237 | ED  | 11101101 | í     |
-' +-----+-----+----------+-------+
-' | 238 | EE  | 11101110 | î     |
-' +-----+-----+----------+-------+
-' | 239 | EF  | 11101111 | ï     |
-' +-----+-----+----------+-------+
-' | 240 | F0  | 11110000 | ð     |
-' +-----+-----+----------+-------+
-' | 241 | F1  | 11110001 | ñ     |
-' +-----+-----+----------+-------+
-' | 242 | F2  | 11110010 | ò     |
-' +-----+-----+----------+-------+
-' | 243 | F3  | 11110011 | ó     |
-' +-----+-----+----------+-------+
-' | 244 | F4  | 11110100 | ô     |
-' +-----+-----+----------+-------+
-' | 245 | F5  | 11110101 | õ     |
-' +-----+-----+----------+-------+
-' | 246 | F6  | 11110110 | ö     |
-' +-----+-----+----------+-------+
-' | 247 | F7  | 11110111 | ÷     |
-' +-----+-----+----------+-------+
-' | 248 | F8  | 11111000 | ø     |
-' +-----+-----+----------+-------+
-' | 249 | F9  | 11111001 | ù     |
-' +-----+-----+----------+-------+
-' | 250 | FA  | 11111010 | ú     |
-' +-----+-----+----------+-------+
-' | 251 | FB  | 11111011 | û     |
-' +-----+-----+----------+-------+
-' | 252 | FC  | 11111100 | ü     |
-' +-----+-----+----------+-------+
-' | 253 | FD  | 11111101 | ý     |
-' +-----+-----+----------+-------+
-' | 254 | FE  | 11111110 | þ     |
-' +-----+-----+----------+-------+
-' | 255 | FF  | 11111111 | ÿ     |
-' +-----+-----+----------+-------+
+' See "frmExtendedChars.cls"
diff --git a/Testing/Testing.accdb.src/forms/frmExtendedChars.cls b/Testing/Testing.accdb.src/forms/frmExtendedChars.cls
index b366db29..80c58d95 100644
--- a/Testing/Testing.accdb.src/forms/frmExtendedChars.cls
+++ b/Testing/Testing.accdb.src/forms/frmExtendedChars.cls
@@ -1,99 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Form
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    DefaultView =0
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =8884
-    DatasheetFontHeight =11
-    ItemSuffix =2
-    Right =25320
-    Bottom =14385
-    RecSrcDt = Begin
-        0xbd57868e6cf5e540
-    End
-    DatasheetFontName ="Franklin Gothic Book"
-    AllowDatasheetView =0
-    FilterOnLoad =0
-    ShowPageMargins =0
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Section
-            Height =7560
-            Name ="Detail"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin Label
-                    OverlapFlags =85
-                    Left =1080
-                    Top =1140
-                    Width =3420
-                    Height =600
-                    FontSize =18
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label0"
-                    Caption ="Extëndëd Cháráctërs"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =1080
-                    LayoutCachedTop =1140
-                    LayoutCachedWidth =4500
-                    LayoutCachedHeight =1740
-                End
-                Begin Label
-                    OverlapFlags =85
-                    Left =1080
-                    Top =2220
-                    Width =3420
-                    Height =600
-                    FontSize =18
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label1"
-                    Caption ="Unicode 👍 🚀 ☺"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =1080
-                    LayoutCachedTop =2220
-                    LayoutCachedWidth =4500
-                    LayoutCachedHeight =2820
-                End
-            End
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/forms/frmMain.bas b/Testing/Testing.accdb.src/forms/frmMain.bas
index db651d2e..e219531e 100644
--- a/Testing/Testing.accdb.src/forms/frmMain.bas
+++ b/Testing/Testing.accdb.src/forms/frmMain.bas
@@ -364,261 +364,4 @@ Begin Form
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
-
-
-' Keep track of total results
-Private m_Totals(True To False) As Integer
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : cmdRunTests_Click
-' Author    : Adam Waller
-' Date      : 5/1/2020
-' Purpose   : Trying to keep things simple here... Verify that the object exists in the
-'           : correct format. (Adjust as needed)
-'---------------------------------------------------------------------------------------
-'
-Public Sub cmdRunTests_Click()
-
-    Dim strTest As String
-    Dim intTest As Integer
-    Dim dbs As DAO.Database
-    Dim rsc As SharedResource
-
-    Set dbs = CurrentDb
-
-    ' Clear list and totals
-    lstResults.RowSource = ""
-    m_Totals(True) = 0
-    m_Totals(False) = 0
-
-    ' Ignore any errors.
-    ' NOTE: don't include the test result on a line that may throw an error.
-    On Error Resume Next
-
-    ' Update linked tables/CSV to use the current directory
-    dbs.TableDefs("tblLinkedAccess").Connect = ";DATABASE=" & Application.CurrentProject.Path & "\Testing.accdb"
-    dbs.TableDefs("tblLinkedAccess").RefreshLink
-    dbs.TableDefs("tblLinkedCSV").Connect = "Text;DSN=Linked Link Specification;FMT=Delimited;HDR=NO;IMEX=2;CharacterSet=437;ACCDB=YES;DATABASE=" & Application.CurrentProject.Path
-    dbs.TableDefs("tblLinkedCSV").RefreshLink
-
-    '========================
-    '   BEGIN TESTS
-    '========================
-
-    ' Tables
-    strTest = dbs.TableDefs("tblInternal").Name
-    ShowResult "Access Table exists", (strTest = "tblInternal")
-
-    intTest = 0
-    intTest = DCount("*", "tblInternal")
-    ShowResult "tblInternal has data", (intTest > 0)
-
-    strTest = dbs.TableDefs("tblLinkedCSV").Name
-    ShowResult "Linked Table exists", (strTest = "tblLinkedCSV")
-
-    intTest = 0
-    intTest = DCount("*", "tblLinkedCSV")
-    ShowResult "tblLinkedCSV has data", (intTest > 0)
-
-    ShowResult "Saved Table Data (TDF)", FSO.FileExists(ExportFolder & "tables\tblInternal.txt")
-
-    ShowResult "Saved Table Data (XML)", FSO.FileExists(ExportFolder & "tables\tblSaveXML.xml")
-
-    ShowResult "Table SQL", FSO.FileExists(ExportFolder & "tbldefs\tblInternal.sql")
-
-    ShowResult "Linked Table JSON", FSO.FileExists(ExportFolder & "tbldefs\tblLinkedCSV.json")
-
-    ShowResult "Linked Table structure", FSO.FileExists(ExportFolder & "tbldefs\tblLinkedCSV.sql")
-
-    intTest = 0
-    intTest = dbs.Relations("tblInternaltblSaveXML").Fields.Count
-    ShowResult "Table Relationship", (intTest = 1)
-
-    intTest = 0
-    intTest = DCount("*", "MSysObjects", "Not IsNull(LvExtra) and Type = 1 and [Name] = 'tblSaveXML'")
-    ShowResult "Table Data Macro Exists", (intTest > 0)
-
-
-    ' Queries
-    strTest = dbs.QueryDefs("qryNavigationPaneGroups").Name
-    ShowResult "Query exists", (strTest = "qryNavigationPaneGroups")
-
-
-    ' Forms
-    strTest = CurrentProject.AllForms("frmMain").Name
-    ShowResult "Form exists", (strTest = "frmMain")
-
-
-    ' Reports
-    strTest = CurrentProject.AllReports("rptNavigationPaneGroups").Name
-    ShowResult "Report exists", (strTest = "rptNavigationPaneGroups")
-    ShowResult "Landscape Orientation", (Report_rptNonDefaultPaperSize.Printer.Orientation = acPRORLandscape)
-    ShowResult "A4 Paper Size", (Report_rptNonDefaultPaperSize.Printer.PaperSize = acPRPSA4)
-
-
-    ' Macros
-    strTest = CurrentProject.AllMacros("AutoExec").Name
-    ShowResult "Macro exists", (strTest = "AutoExec")
-
-
-    ' Modules
-    strTest = CurrentProject.AllModules("basUtility").Name
-    ShowResult "Standard Module exists", (strTest = "basUtility")
-    strTest = GetVBProjectForCurrentDB.VBComponents("basExtendedChars").CodeModule.Lines(6, 1)
-    ShowResult "Extended ASCII text in VBA", (Mid$(strTest, 10, 1) = Chr(151))
-
-    strTest = CurrentProject.AllModules("clsPerson").Name
-    ShowResult "Class Module exists", (strTest = "clsPerson")
-
-
-    ' Database properties
-    strTest = ""
-    strTest = dbs.Properties("AppIcon")
-    ShowResult "Application Icon is set", (Len(strTest) > 5)
-
-    strTest = dbs.Properties("DAOProperty").Value
-    ShowResult "Custom Database (DAO) property", (strTest = "DAO")
-
-    strTest = CurrentProject.Properties("ProjectProperty").Value
-    ShowResult "Custom Project Property", (strTest = "TestValue")
-
-    strTest = dbs.Containers("Databases").Documents("SummaryInfo").Properties("Title")
-    ShowResult "Database Summary Property (Title)", (strTest = "VCS Testing")
-
-    strTest = dbs.Containers("Tables").Documents("tblSaveXML").Properties("Description")
-    ShowResult "Navigation pane object description", (strTest = "Saved description in XML table.")
-
-    strTest = dbs.Containers("Modules").Documents("basUtility").Properties("Description")
-    ShowResult "Module description", (strTest = "My special description on the code module.")
-
-    ShowResult "Saved shared images", (CurrentProject.Resources.Count > 2)
-
-    ShowResult "Saved import/export specs (XML)", (CurrentProject.ImportExportSpecifications.Count > 0)
-
-    strTest = CurrentProject.ImportExportSpecifications(0).Name
-    ShowResult "Name of saved specification", (strTest = "Export-MSysIMEXColumns")
-
-    strTest = Nz(DLookup("SpecName", "MSysIMEXSpecs", "SpecName=""Test 2"""))
-    ShowResult "Saved IMEX spec (Table based)", (strTest = "Test 2")
-
-    strTest = Nz(DLookup("Name", "MSysNavPaneGroups", "Name=""My Modules"""))
-    ShowResult "Custom navigation pane group", (strTest = "My Modules")
-
-    ' VBE Project
-    With GetVBProjectForCurrentDB
-
-        ShowResult "VBE project name", (.Name = "VCS Testing")
-        ShowResult "VBE project description", (.Description = "For automated testing of Version Control")
-        ShowResult "Help context id", (.HelpContextId = 123456)
-
-        strTest = .References("Scripting").Name
-        ShowResult "GUID reference (scripting)", (strTest = "Scripting")
-
-        strTest = .References("MSForms").Name
-        ShowResult "MS Forms 2.0 reference", (strTest = "MSForms")
-
-    End With
-
-    ' Theme
-    strTest = CurrentDb.Properties("Theme Resource Name")
-    ShowResult "Active theme = Angles", (strTest = "Angles")
-
-    strTest = vbNullString
-    For Each rsc In CurrentProject.Resources
-        If rsc.Type = acResourceTheme Then
-            strTest = rsc.Name
-            If strTest = "Angles" Then Exit For
-        End If
-    Next rsc
-    ShowResult "Theme resource exists", (strTest = "Angles")
-
-    ' Other
-    ShowResult "VCS Options file exists", FSO.FileExists(ExportFolder & "vcs-options.json")
-
-
-    '========================
-    '   END TESTS
-    '========================
-
-    ' Display results
-    lblResults.Caption = _
-        m_Totals(True) & " tests passed" & vbCrLf & _
-        m_Totals(False) & " tests failed"
-
-    If m_Totals(False) = 0 Then
-        imgResult.Picture = "button_ok"
-    Else
-        imgResult.Picture = "button_error"
-    End If
-
-    If Err Then Err.Clear
-
-End Sub
-
-
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : ShowResult
-' Author    : Adam Waller
-' Date      : 5/1/2020
-' Purpose   : Add the result to the list.
-'---------------------------------------------------------------------------------------
-'
-Private Function ShowResult(strText As String, blnPassed As Boolean)
-    Dim strIcon As String
-    If blnPassed Then
-        strIcon = ChrW(10004)   ' Check
-    Else
-        strIcon = ChrW(10060)   ' X
-    End If
-    lstResults.AddItem strIcon & ";" & strText
-    m_Totals(blnPassed) = m_Totals(blnPassed) + 1
-    DoEvents
-End Function
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : cmdEditTests_Click
-' Author    : Adam Waller
-' Date      : 5/1/2020
-' Purpose   : Go to the code where you can edit the tests.
-'---------------------------------------------------------------------------------------
-'
-Private Sub cmdEditTests_Click()
-    Dim intLine As Integer
-    VBE.MainWindow.Visible = True
-    With VBE.VBProjects("VCS Testing").VBComponents("Form_frmMain")
-        .Activate
-        With .CodeModule
-            intLine = 27 + .ProcStartLine("cmdRunTests_Click", vbext_pk_Proc)
-            .CodePane.SetSelection intLine, 1, intLine, 1
-            .CodePane.Show
-        End With
-    End With
-    AppActivate VBE.MainWindow.Caption
-End Sub
-
-
-'---------------------------------------------------------------------------------------
-' Procedure : ExportFolder
-' Author    : Adam Waller
-' Date      : 5/7/2020
-' Purpose   : Return base export folder for testing for source files.
-'---------------------------------------------------------------------------------------
-'
-Private Function ExportFolder() As String
-    ExportFolder = CurrentProject.FullName & ".src\"
-End Function
-
-
-Private Sub Form_Load()
-    imgResult.Picture = vbNullString
-End Sub
+' See "frmMain.cls"
diff --git a/Testing/Testing.accdb.src/forms/frmMain.cls b/Testing/Testing.accdb.src/forms/frmMain.cls
index db651d2e..c66f5f00 100644
--- a/Testing/Testing.accdb.src/forms/frmMain.cls
+++ b/Testing/Testing.accdb.src/forms/frmMain.cls
@@ -1,370 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Form
-    RecordSelectors = NotDefault
-    NavigationButtons = NotDefault
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    DefaultView =0
-    TabularFamily =18
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =9360
-    DatasheetFontHeight =11
-    ItemSuffix =13
-    Right =19650
-    Bottom =12585
-    RecSrcDt = Begin
-        0x18691eff0b76e540
-    End
-    Caption ="Main Form"
-    DatasheetFontName ="Palatino Linotype"
-    OnLoad ="[Event Procedure]"
-    FilterOnLoad =0
-    ShowPageMargins =0
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    ThemeName ="Executive"
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Image
-            BackStyle =0
-            OldBorderStyle =0
-            BorderLineStyle =0
-            SizeMode =3
-            PictureAlignment =2
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin CommandButton
-            FontSize =11
-            FontWeight =400
-            FontName ="Calibri"
-            ForeThemeColorIndex =0
-            ForeTint =75.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-            UseTheme =1
-            Shape =1
-            Gradient =12
-            BackThemeColorIndex =4
-            BackTint =60.0
-            BorderLineStyle =0
-            BorderThemeColorIndex =4
-            BorderTint =60.0
-            ThemeFontIndex =1
-            HoverThemeColorIndex =4
-            HoverTint =40.0
-            PressedThemeColorIndex =4
-            PressedShade =75.0
-            HoverForeThemeColorIndex =0
-            HoverForeTint =75.0
-            PressedForeThemeColorIndex =0
-            PressedForeTint =75.0
-        End
-        Begin ListBox
-            BorderLineStyle =0
-            LabelX =-1800
-            FontSize =11
-            FontName ="Calibri"
-            AllowValueListEdits =1
-            InheritValueList =1
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            ForeThemeColorIndex =0
-            ForeTint =75.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin UnboundObjectFrame
-            SpecialEffect =2
-            OldBorderStyle =1
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            ForeThemeColorIndex =2
-            ForeShade =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin CustomControl
-            OldBorderStyle =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin Section
-            Height =7620
-            Name ="Detail"
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =18
-                    Left =5400
-                    Top =2940
-                    Width =3120
-                    Height =720
-                    ForeColor =4210752
-                    Name ="cmdRunTests"
-                    Caption ="  Verify Database Objects"
-                    OnClick ="[Event Procedure]"
-                    FontName ="Palatino Linotype"
-                    GridlineColor =10921638
-                    ImageData = Begin
-                        0x2800000010000000100000000100200000000000000000000000000000000000 ,
-                        0x0000000000000000b0a090ff604830ff604830ff604830ff604830ff604830ff ,
-                        0x604830ff604830ff604830ff604830ff604830ff000000000000000000000000 ,
-                        0x0000000000000000b0a090fffff8f0ffe0e0e0ffe0d8d0ffe0d8d0ffe0d0c0ff ,
-                        0xe0c8c0ffd0c0b0ffd0c0b0ffd0b8a0ff604830ff000000000000000000000000 ,
-                        0x0000000000000000b0a090ffffffffffd0b8b0ffd0b8a0ffd0b0a0ffb0a090ff ,
-                        0x604830ff604830ff604830ff604830ff604830ff604830ff604830ff604830ff ,
-                        0x604830ff604830ffb0a090fffffffffffffffffffff8f0fffff0f0ffb0a090ff ,
-                        0xfff8f0ffe0e0e0ffe0d8d0ffe0d8d0ffe0d0c0ffe0c8c0ffd0c0b0ffd0c0b0ff ,
-                        0xd0b8a0ff604830ffc0a8a0ffffffffffe0c8c0ffe0c8c0ffd0c0b0ffb0a090ff ,
-                        0xffffffffd0b8b0ffd0b8a0ffd0b0a0ffffe8e0ffc09080ffc09080ffc09080ff ,
-                        0xd0b8b0ff604830ffc0b0a0ffffffffffb0a090ff604830ff604830ffb0a090ff ,
-                        0xfffffffffffffffffff8f0fffff0f0fffff0e0ffffe8e0ffffe0d0ffffd8d0ff ,
-                        0xd0c0b0ff604830ffd0b0a0ffffffffffb0a090fffff8f0ffe0e0e0ffc0a8a0ff ,
-                        0xffffffffe0c8c0ffe0c8c0ffd0c0b0fffff8f0ffc0a890ffc0a890ffc0a090ff ,
-                        0xe0d0c0ff604830ffd0b8a0ffffffffffb0a090ffffffffffd0b8b0ffc0b0a0ff ,
-                        0xfffffffffffffffffffffffffffffffffffffffffff8f0fffff0f0ffffe8e0ff ,
-                        0xe0d8d0ff604830fff0a890fff0a880ffb0a090ffffffffffffffffffd0b0a0ff ,
-                        0xffffffffe0c8c0ffe0c8c0ffe0c8c0ffffffffffd0b0a0ffd0b0a0ffd0a8a0ff ,
-                        0xe0e0e0ff604830fff0a890ffffc0a0ffc0a8a0ffffffffffe0c8c0ffd0b8a0ff ,
-                        0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8ffff ,
-                        0xfff8f0ff604830fff0a890fff0a880ffc0b0a0fffffffffffffffffff0a890ff ,
-                        0xf0a880fff0a080fff0a070ffe09870ffe09060ffe08860ffe08050ffe07840ff ,
-                        0xe07840ffd06030ff0000000000000000d0b0a0ffffffffffe0c8c0fff0a890ff ,
-                        0xffc0a0ffffc0a0ffffb890ffffb890ffffb090ffffa880fff0a070fff0a070ff ,
-                        0xf09870ffd06830ff0000000000000000d0b8a0fffffffffffffffffff0a890ff ,
-                        0xf0a880fff0a080fff0a080ffe09870ffe09060ffe08860ffe08850ffe08050ff ,
-                        0xe07840ffe07840ff0000000000000000f0a890fff0a880fff0a080fff0a070ff ,
-                        0xe09870ffe09060ffe08860ffe08050ffe07840ffe07840ffd06030ff00000000 ,
-                        0x00000000000000000000000000000000f0a890ffffc0a0ffffc0a0ffffb890ff ,
-                        0xffb890ffffb090ffffa880fff0a070fff0a070fff09870ffd06830ff00000000 ,
-                        0x00000000000000000000000000000000f0a890fff0a880fff0a080fff0a080ff ,
-                        0xe09870ffe09060ffe08860ffe08850ffe08050ffe07840ffe07840ff00000000 ,
-                        0x0000000000000000
-                    End
-
-                    LayoutCachedLeft =5400
-                    LayoutCachedTop =2940
-                    LayoutCachedWidth =8520
-                    LayoutCachedHeight =3660
-                    PictureCaptionArrangement =5
-                    BackColor =13807008
-                    BorderColor =13807008
-                    HoverColor =14796991
-                    PressedColor =9262658
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                    Overlaps =1
-                End
-                Begin ListBox
-                    RowSourceTypeInt =1
-                    OverlapFlags =85
-                    TextFontFamily =18
-                    IMESentenceMode =3
-                    ColumnCount =2
-                    Left =600
-                    Top =1140
-                    Width =4455
-                    Height =5745
-                    TabIndex =1
-                    ForeColor =4210752
-                    BorderColor =10921638
-                    Name ="lstResults"
-                    RowSourceType ="Value List"
-                    RowSource ="✔;Access Table exists;✔;tblInternal has data;✔;Linked Table exists;✔;tblLinkedCS"
-                        "V has data;✔;Saved Table Data (TDF);✔;Saved Table Data (XML);✔;Table SQL;✔;Linke"
-                        "d Table JSON;✔;Linked Table structure;✔;Table Relationship;✔;Table Data Macro Ex"
-                        "ists;✔;Query exists;✔;Form exists;✔;Report exists;✔;Application Icon is set;✔;Cu"
-                        "stom Database (DAO) property;✔;Custom Project Property"
-                    ColumnWidths ="479;3975"
-                    FontName ="Palatino Linotype"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =600
-                    LayoutCachedTop =1140
-                    LayoutCachedWidth =5055
-                    LayoutCachedHeight =6885
-                    Begin
-                        Begin Label
-                            OverlapFlags =85
-                            TextFontFamily =18
-                            Left =780
-                            Top =720
-                            Width =2880
-                            Height =320
-                            BorderColor =8355711
-                            ForeColor =8355711
-                            Name ="Col1_Label"
-                            Caption ="Test Results"
-                            FontName ="Palatino Linotype"
-                            GridlineColor =10921638
-                            LayoutCachedLeft =780
-                            LayoutCachedTop =720
-                            LayoutCachedWidth =3660
-                            LayoutCachedHeight =1040
-                        End
-                    End
-                End
-                Begin Label
-                    OverlapFlags =85
-                    TextFontFamily =18
-                    Left =5400
-                    Top =1140
-                    Width =3720
-                    Height =1635
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label4"
-                    Caption ="Click the button below to verify the objects in the current database. This helps"
-                        " confirm that everything was correctly reconstructed from source."
-                    FontName ="Palatino Linotype"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =5400
-                    LayoutCachedTop =1140
-                    LayoutCachedWidth =9120
-                    LayoutCachedHeight =2775
-                End
-                Begin CommandButton
-                    OverlapFlags =85
-                    TextFontFamily =18
-                    Left =5400
-                    Top =3900
-                    Width =3120
-                    Height =720
-                    TabIndex =2
-                    ForeColor =4210752
-                    Name ="cmdEditTests"
-                    Caption ="  Edit Tests..."
-                    OnClick ="[Event Procedure]"
-                    FontName ="Palatino Linotype"
-                    GridlineColor =10921638
-                    ImageData = Begin
-                        0x2800000010000000100000000100200000000000000000000000000000000000 ,
-                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
-                        0x000000000000000000000000000000000000000000000000bb461e4800000000 ,
-                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
-                        0x000000003088305000000000000000000000000080281040803010ffd0502040 ,
-                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
-                        0x20302040005000ff40a040400000000080281040e05020ff803010ff803010ff ,
-                        0xd050204000000000000000000000000000000000000000000000000020302040 ,
-                        0x208030ff005000ff005000ff30983040e05020ffe06840ffe09880ffd07860ff ,
-                        0x803010ff00000000000000000038f040001890ff0018803000000000208030ff ,
-                        0x309850ff60c080ff208030ff005000ffe07050fff0a890ffffc8b0fff0b8a0ff ,
-                        0xc07050ff000000000030f0400038ffff001890ff001890ff0018803030a850ff ,
-                        0x80d890ffb0e8c0ff90e0a0ff208030fff0907020f08870ffffc0b0fff09070ff ,
-                        0xf0907040000000000030f0ff2058ffff7098ffff0028d0ff001890ff40c07040 ,
-                        0x30a850ffa0e8b0ff30a850ff60986040706860c0b0786030f09070fff0907070 ,
-                        0x00000000000000001050ffff90a8ffffa0c0ffff7098ffff0020b0ff00000000 ,
-                        0x40c0604030a850ff50a87040706860f070686020000000000018801000000000 ,
-                        0x00000000000000005080ff405078ffffa0b0ffff5078ffff6070c04000000000 ,
-                        0x0000000070686020706860e070686020706860e02048d060001890ff00188020 ,
-                        0x0000000000000000000000005080ff405080ffff6070b050706860e070686020 ,
-                        0x70686020706860e070686010000000002048c0600038ffff001890ff001890ff ,
-                        0x00188020000000000000000000000000000000000000000070686030508090a0 ,
-                        0x006080ff2060707000000000000000000030f0ff2058ffff7098ffff0028d0ff ,
-                        0x001890ff000000000000000000000000000000000000000000a8f04000a0e0ff ,
-                        0x006890ff006890ff00608070000000001050ffff90a8ffffa0c0ffff7098ffff ,
-                        0x0020b0ff000000000000000000000000000000000000000000a0e0ff10b0e0ff ,
-                        0x80e0ffff0090c0ff006890ff000000005080ff405078ffffa0b0ffff5078ffff ,
-                        0x5078ff40000000000000000000000000000000000000000000a0e0ff90e8ffff ,
-                        0xb0f0ffff90e0ffff00a0e0ff00000000000000005080ff405080ffff5080ff40 ,
-                        0x00000000000000000000000000000000000000000000000040c8ff4000a0e0ff ,
-                        0xa0e8ffff00a0e0ff50d0ff400000000000000000000000000000000000000000 ,
-                        0x0000000000000000000000000000000000000000000000000000000060d0ff70 ,
-                        0x00a0e0ff50d0ff40000000000000000000000000000000000000000000000000 ,
-                        0x0000000000000000
-                    End
-
-                    LayoutCachedLeft =5400
-                    LayoutCachedTop =3900
-                    LayoutCachedWidth =8520
-                    LayoutCachedHeight =4620
-                    PictureCaptionArrangement =5
-                    BackColor =13807008
-                    BorderColor =13807008
-                    HoverColor =14796991
-                    PressedColor =9262658
-                    HoverForeColor =4210752
-                    PressedForeColor =4210752
-                    Overlaps =1
-                End
-                Begin Label
-                    OverlapFlags =93
-                    TextFontFamily =18
-                    Left =5400
-                    Top =4860
-                    Width =3060
-                    Height =1635
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="lblResults"
-                    Caption ="17 tests passed\015\0120 tests failed"
-                    FontName ="Palatino Linotype"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =5400
-                    LayoutCachedTop =4860
-                    LayoutCachedWidth =8460
-                    LayoutCachedHeight =6495
-                End
-                Begin Image
-                    PictureType =2
-                    Left =7860
-                    Top =4860
-                    Width =600
-                    Height =720
-                    BorderColor =10921638
-                    Name ="imgResult"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =7860
-                    LayoutCachedTop =4860
-                    LayoutCachedWidth =8460
-                    LayoutCachedHeight =5580
-                    TabIndex =3
-                End
-            End
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
index d3e1c296..56270d63 100644
--- a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
+++ b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.bas
@@ -91,9 +91,4 @@ Begin Report
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
+' See "rptDefaultPrinter.cls"
diff --git a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls
index d3e1c296..88b9322e 100644
--- a/Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls
+++ b/Testing/Testing.accdb.src/reports/rptDefaultPrinter.cls
@@ -1,97 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Report
-    LayoutForPrint = NotDefault
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    TabularFamily =0
-    DateGrouping =1
-    GrpKeepTogether =1
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =8884
-    DatasheetFontHeight =11
-    ItemSuffix =1
-    RecSrcDt = Begin
-        0xe05ff061b477e540
-    End
-    DatasheetFontName ="Franklin Gothic Book"
-    FilterOnLoad =0
-    FitToPage =1
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin PageHeader
-            Height =360
-            Name ="PageHeaderSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-        Begin Section
-            KeepTogether = NotDefault
-            Height =7560
-            Name ="Detail"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin Label
-                    TextFontFamily =0
-                    Left =1260
-                    Top =240
-                    Width =4800
-                    Height =420
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label0"
-                    Caption ="This report does not have any saved print settings."
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =1260
-                    LayoutCachedTop =240
-                    LayoutCachedWidth =6060
-                    LayoutCachedHeight =660
-                End
-            End
-        End
-        Begin PageFooter
-            Height =360
-            Name ="PageFooterSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
index f8cde805..c4309c26 100644
--- a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
+++ b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.bas
@@ -278,9 +278,4 @@ Begin Report
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
+' See "rptNavigationPaneGroups.cls"
diff --git a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls
index f8cde805..88b9322e 100644
--- a/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls
+++ b/Testing/Testing.accdb.src/reports/rptNavigationPaneGroups.cls
@@ -1,284 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Report
-    LayoutForPrint = NotDefault
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    TabularFamily =0
-    DateGrouping =1
-    GrpKeepTogether =1
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =11700
-    DatasheetFontHeight =11
-    ItemSuffix =7
-    RecSrcDt = Begin
-        0x2df649898e77e540
-    End
-    RecordSource ="qryNavigationPaneGroups"
-    Caption ="qryNavigationPaneGroups"
-    DatasheetFontName ="Franklin Gothic Book"
-    FilterOnLoad =0
-    FitToPage =1
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin TextBox
-            AddColon = NotDefault
-            FELineBreak = NotDefault
-            BorderLineStyle =0
-            LabelX =-1800
-            FontSize =11
-            FontName ="Calibri"
-            AsianLineBreak =1
-            ShowDatePicker =0
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =1
-            BorderShade =65.0
-            ThemeFontIndex =1
-            ForeThemeColorIndex =0
-            ForeTint =75.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin BreakLevel
-            GroupHeader = NotDefault
-            ControlSource ="ObjectName"
-        End
-        Begin BreakLevel
-            ControlSource ="GroupName"
-        End
-        Begin FormHeader
-            KeepTogether = NotDefault
-            Height =960
-            Name ="ReportHeader"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =2
-            BackTint =20.0
-            Begin
-                Begin Label
-                    TextFontFamily =0
-                    Left =60
-                    Top =60
-                    Width =4350
-                    Height =540
-                    FontSize =20
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label4"
-                    Caption ="qryNavigationPaneGroups"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =60
-                    LayoutCachedTop =60
-                    LayoutCachedWidth =4410
-                    LayoutCachedHeight =600
-                End
-            End
-        End
-        Begin PageHeader
-            Height =435
-            Name ="PageHeaderSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin Label
-                    TextAlign =1
-                    TextFontFamily =0
-                    Left =360
-                    Top =60
-                    Width =3660
-                    Height =315
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="ObjectName_Label"
-                    Caption ="ObjectName"
-                    FontName ="Franklin Gothic Book"
-                    Tag ="DetachedLabel"
-                    GridlineStyleBottom =1
-                    GridlineColor =10921638
-                    LayoutCachedLeft =360
-                    LayoutCachedTop =60
-                    LayoutCachedWidth =4020
-                    LayoutCachedHeight =375
-                End
-                Begin Label
-                    TextAlign =1
-                    TextFontFamily =0
-                    Left =4380
-                    Top =60
-                    Width =7260
-                    Height =315
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="GroupName_Label"
-                    Caption ="GroupName"
-                    FontName ="Franklin Gothic Book"
-                    Tag ="DetachedLabel"
-                    GridlineStyleBottom =1
-                    GridlineColor =10921638
-                    LayoutCachedLeft =4380
-                    LayoutCachedTop =60
-                    LayoutCachedWidth =11640
-                    LayoutCachedHeight =375
-                End
-            End
-        End
-        Begin BreakHeader
-            KeepTogether = NotDefault
-            Height =390
-            Name ="GroupHeader0"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin TextBox
-                    DecimalPlaces =0
-                    OldBorderStyle =0
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =360
-                    Width =3660
-                    Height =330
-                    ColumnWidth =1665
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="ObjectName"
-                    ControlSource ="ObjectName"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =360
-                    LayoutCachedWidth =4020
-                    LayoutCachedHeight =330
-                End
-            End
-        End
-        Begin Section
-            KeepTogether = NotDefault
-            Height =390
-            Name ="Detail"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin TextBox
-                    OldBorderStyle =0
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =4380
-                    Width =7260
-                    Height =330
-                    ColumnWidth =1545
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="GroupName"
-                    ControlSource ="GroupName"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =4380
-                    LayoutCachedWidth =11640
-                    LayoutCachedHeight =330
-                End
-            End
-        End
-        Begin PageFooter
-            Height =570
-            Name ="PageFooterSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin TextBox
-                    OldBorderStyle =0
-                    TextAlign =1
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =60
-                    Top =240
-                    Width =5040
-                    Height =330
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text5"
-                    ControlSource ="=Now()"
-                    Format ="Long Date"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =60
-                    LayoutCachedTop =240
-                    LayoutCachedWidth =5100
-                    LayoutCachedHeight =570
-                End
-                Begin TextBox
-                    OldBorderStyle =0
-                    TextAlign =3
-                    TextFontFamily =0
-                    IMESentenceMode =3
-                    Left =6600
-                    Top =240
-                    Width =5040
-                    Height =330
-                    TabIndex =1
-                    BorderColor =10921638
-                    ForeColor =4210752
-                    Name ="Text6"
-                    ControlSource ="=\"Page \" & [Page] & \" of \" & [Pages]"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-
-                    LayoutCachedLeft =6600
-                    LayoutCachedTop =240
-                    LayoutCachedWidth =11640
-                    LayoutCachedHeight =570
-                End
-            End
-        End
-        Begin FormFooter
-            KeepTogether = NotDefault
-            Height =0
-            Name ="ReportFooter"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
index 5c540100..64ac69f3 100644
--- a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
+++ b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.bas
@@ -90,9 +90,4 @@ Begin Report
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
+' See "rptNonDefaultPaperSize.cls"
diff --git a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls
index 5c540100..88b9322e 100644
--- a/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls
+++ b/Testing/Testing.accdb.src/reports/rptNonDefaultPaperSize.cls
@@ -1,96 +1,4 @@
-Version =20
-VersionRequired =20
-Begin Report
-    LayoutForPrint = NotDefault
-    DividingLines = NotDefault
-    AllowDesignChanges = NotDefault
-    DateGrouping =1
-    GrpKeepTogether =1
-    PictureAlignment =2
-    DatasheetGridlinesBehavior =3
-    GridX =24
-    GridY =24
-    Width =8884
-    DatasheetFontHeight =11
-    ItemSuffix =1
-    RecSrcDt = Begin
-        0xe05ff061b477e540
-    End
-    DatasheetFontName ="Franklin Gothic Book"
-    FilterOnLoad =0
-    FitToPage =1
-    DisplayOnSharePointSite =1
-    DatasheetAlternateBackColor =15921906
-    DatasheetGridlinesColor12 =0
-    FitToScreen =1
-    DatasheetBackThemeColorIndex =1
-    BorderThemeColorIndex =3
-    ThemeFontIndex =1
-    ForeThemeColorIndex =0
-    AlternateBackThemeColorIndex =1
-    AlternateBackShade =95.0
-    Begin
-        Begin Label
-            BackStyle =0
-            FontSize =11
-            FontName ="Calibri"
-            ThemeFontIndex =1
-            BackThemeColorIndex =1
-            BorderThemeColorIndex =0
-            BorderTint =50.0
-            ForeThemeColorIndex =0
-            ForeTint =50.0
-            GridlineThemeColorIndex =1
-            GridlineShade =65.0
-        End
-        Begin PageHeader
-            Height =360
-            Name ="PageHeaderSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-        Begin Section
-            KeepTogether = NotDefault
-            Height =7560
-            Name ="Detail"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-            Begin
-                Begin Label
-                    TextFontFamily =0
-                    Left =1260
-                    Top =240
-                    Width =4800
-                    Height =420
-                    BorderColor =8355711
-                    ForeColor =8355711
-                    Name ="Label0"
-                    Caption ="This report uses A4 landscape paper size"
-                    FontName ="Franklin Gothic Book"
-                    GridlineColor =10921638
-                    LayoutCachedLeft =1260
-                    LayoutCachedTop =240
-                    LayoutCachedWidth =6060
-                    LayoutCachedHeight =660
-                End
-            End
-        End
-        Begin PageFooter
-            Height =360
-            Name ="PageFooterSection"
-            AutoHeight =1
-            AlternateBackThemeColorIndex =1
-            AlternateBackShade =95.0
-            BackThemeColorIndex =1
-        End
-    End
-End
-CodeBehindForm
-Attribute VB_GlobalNameSpace = False
+Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = True
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
diff --git a/Testing/Testing.accdb.src/vcs-options.json b/Testing/Testing.accdb.src/vcs-options.json
index 6f864346..4a042444 100644
--- a/Testing/Testing.accdb.src/vcs-options.json
+++ b/Testing/Testing.accdb.src/vcs-options.json
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.22",
+    "AddinVersion": "4.0.26",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {
@@ -36,6 +36,7 @@
     "FormatSQL": true,
     "ForceImportOriginalQuerySQL": false,
     "SaveTableSQL": true,
+    "SplitLayoutFromVBA": true,
     "StripPublishOption": true,
     "SanitizeColors": 1,
     "SanitizeLevel": 2,

From 436dd45e387f8a5beb9aa4b3e1840be7cb72fb51 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 09:32:12 -0600
Subject: [PATCH 52/73] Adjust version number

I am using the minor version number to represent releases from the main branch, and the build number to continuously increment during the development cycle.
---
 Version Control.accda.src/dbs-properties.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index 58b40237..76c27ef6 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.1.0",
+      "Value": "4.0.26",
       "Type": 10
     },
     "Auto Compact": {

From 26bf0308b8b592f8a10f198d33a811c4d92a5f21 Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:46:13 -0500
Subject: [PATCH 53/73] Revert the ConvDateUTC and ConvTimeUTC functions to
 always parse the "Fast" way first and revert otherwise. this allows the
 optimization to be used everywhere with no code changes. Ensure that
 millisecond accuracy is kept for otherse using the function. No Speed impact
 is noted on my end to doing this.

---
 .../modules/modUtcConverter.bas               | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index a632f023..d6ffb21f 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -466,14 +466,14 @@ Public Function ParseIso(utc_IsoString As String _
     Exit Function
 #Else
     If UBound(utc_Parts) > 0 Then
-        utc_DateTimeOut = ConvDateUTC2(utc_Parts(0)) + ConvTimeUTC2(utc_Parts(1))
+        utc_DateTimeOut = ConvDateUTC(utc_Parts(0)) + ConvTimeUTC(utc_Parts(1))
         If Not OutputUTCDate Then
             ParseIso = ConvertToLocalDate(utc_DateTimeOut)
         Else
             ParseIso = utc_DateTimeOut
         End If
     Else ' Assume any "Date Only" Text doesn't have a timezone (they aren't converted the other way, either)
-        ParseIso = ConvDateUTC2(utc_Parts(0))
+        ParseIso = ConvDateUTC(utc_Parts(0))
     End If
     Exit Function
 #End If
@@ -713,28 +713,28 @@ End Function
 ' Purpose   : Attempt a higher performance conversion first, then fall back to RegEx.
 '---------------------------------------------------------------------------------------
 '
-Private Function ConvDateUTC2(ByVal InVal As String) As Date
+Private Function ConvDateUTC(ByRef InVal As String) As Date
 
     Dim varParts As Variant
 
     If InVal Like "####-##-##" Then
         ' Use high-performance conversion to date
         varParts = Split(InVal, "-")
-        ConvDateUTC2 = DateSerial(varParts(0), varParts(1), varParts(2))
+        ConvDateUTC = DateSerial(varParts(0), varParts(1), varParts(2))
     Else
         ' Fall back to slower RegEx function
-        ConvDateUTC2 = ConvDateUTC(InVal)
+        ConvDateUTC = ConvDateUTC2(InVal)
     End If
 
 End Function
 
 
-Private Function ConvDateUTC(ByVal InVal As String) As Date
+Private Function ConvDateUTC2(ByRef InVal As String) As Date
+
     Dim RetVal As Variant
+    Dim RegEx As New RegExp ' Object
 
-'    Dim RegEx As Object
 '    Set RegEx = CreateObject("VBScript.RegExp")
-    Dim RegEx As New RegExp
     With RegEx
         .Global = True
         .Multiline = True
@@ -773,7 +773,8 @@ Private Function ConvDateUTC(ByVal InVal As String) As Date
         End If
     End With
 
-    ConvDateUTC = RetVal
+    ConvDateUTC2 = RetVal
+
 End Function
 
 
@@ -784,29 +785,30 @@ End Function
 ' Purpose   : Attempt a higher performance conversion first, then fall back to RegEx.
 '---------------------------------------------------------------------------------------
 '
-Private Function ConvTimeUTC2(ByVal InVal As String) As Date
+Private Function ConvTimeUTC(ByVal InVal As String) As Date
 
     Dim varParts As Variant
+    Dim SecondsInPart As String
 
     If InVal Like "##:##:##.###Z" Then
         ' Use high-performance conversion to date
         varParts = Split(InVal, ":")
-        ConvTimeUTC2 = TimeSerial(varParts(0), varParts(1), Left(varParts(2), 2))
+        SecondsInPart = Mid(varParts(2), 1, Len(varParts(2)) - 1)
+        ConvTimeUTC = TimeSerialDbl(varParts(0), varParts(1), SecondsInPart)
     Else
         ' Fall back to slower RegEx function
-        ConvTimeUTC2 = ConvTimeUTC(InVal)
+        ConvTimeUTC = ConvTimeUTC2(InVal)
     End If
 
 End Function
 
 
-Private Function ConvTimeUTC(ByRef InVal As String) As Date
+Private Function ConvTimeUTC2(ByRef InVal As String) As Date
 
     Dim dblHours As Double
     Dim dblMinutes As Double
     Dim dblSeconds As Double
     Dim dblMilliseconds As Double
-
     Dim RegEx As New RegExp ' Object
     'Set RegEx = CreateObject("VBScript.RegExp")
 
@@ -840,10 +842,11 @@ Private Function ConvTimeUTC(ByRef InVal As String) As Date
         dblSeconds = CDbl(NzEmpty(.SubMatches(2), vbNullString))
     End With
 
-    ConvTimeUTC = TimeSerialDbl(dblHours, dblMinutes, dblSeconds)
+    ConvTimeUTC2 = TimeSerialDbl(dblHours, dblMinutes, dblSeconds)
 
 End Function
 
+
 Private Function NzEmpty(ByVal Value As Variant, Optional ByVal value_when_null As Variant = 0) As Variant
 
     Dim return_value As Variant

From 19618005aba52534befe1602ff9e6ac67d51f66b Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:31:57 -0500
Subject: [PATCH 54/73] Pass by ref so we don't need to build more memory use.
 Optimize Offset string building to only do math when it's required and fix
 whitespace.

---
 .../modules/modUtcConverter.bas               | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index d6ffb21f..ed4ff8ca 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -644,6 +644,7 @@ Private Function utc_ConvertDate(utc_Value As Double _
     End If
 End Function
 
+
 Private Function utc_ExecuteInShell(utc_ShellCommand As String) As utc_ShellResult
 #If VBA7 Then
     ' 64bit Mac
@@ -677,8 +678,10 @@ End Function
 #Else
 ' Windows
 
+
 ' Pass in a date, this will return a Windows SystemTime structure with millisecond accuracy.
 Private Function utc_DateToSystemTime(ByRef utc_Value As Date) As utc_SYSTEMTIME ' "Helper Functions
+
     With utc_DateToSystemTime
         .utc_wYear = VBA.Year(utc_Value)
         .utc_wMonth = VBA.Month(utc_Value)
@@ -692,10 +695,13 @@ Private Function utc_DateToSystemTime(ByRef utc_Value As Date) As utc_SYSTEMTIME
             .utc_wSecond = VBA.Second(utc_Value)
         End If
     End With
+
 End Function
 
 
-Private Function utc_SystemTimeToDate(ByRef utc_Value As utc_SYSTEMTIME) As Date ' "Helper Function" for Public Functions (below)
+Private Function utc_SystemTimeToDate(ByRef utc_Value As utc_SYSTEMTIME) As Date
+' "Helper Function" for Public Functions (below)
+
     utc_SystemTimeToDate = DateSerial(utc_Value.utc_wYear _
                                     , utc_Value.utc_wMonth _
                                     , utc_Value.utc_wDay) + _
@@ -703,6 +709,7 @@ Private Function utc_SystemTimeToDate(ByRef utc_Value As utc_SYSTEMTIME) As Date
                                         , utc_Value.utc_wMinute _
                                         , utc_Value.utc_wSecond _
                                         , utc_Value.utc_wMilliseconds)
+
 End Function
 
 
@@ -872,9 +879,11 @@ Public Function TimeSerialDbl(ByVal HoursIn As Double _
                             , ByVal MinutesIn As Double _
                             , ByVal SecondsIn As Double _
                             , Optional ByVal MillisecondsIn As Double = 0) As Double
+
     Dim tMS As Double
     Dim tSec As Double
     Dim tSecTemp As Double
+
     tSec = VBA.CDbl(RoundDown(SecondsIn))
     tSecTemp = SecondsIn - tSec
     tMS = (tSecTemp * (TotalMillisecondsInDay / TotalSecondsInDay)) \ 1
@@ -882,10 +891,13 @@ Public Function TimeSerialDbl(ByVal HoursIn As Double _
     If (tSecTemp > 0.5) Then tSec = tSec - 1
     If tMS = 500 Then tMS = tMS - 0.001 ' Shave a hair, because otherwise it'll round up too much.
     TimeSerialDbl = (HoursIn / TotalHoursInDay) + (MinutesIn / TotalMinutesInDay) + CDbl((tSec / TotalSecondsInDay)) + (tMS / TotalMillisecondsInDay)
+
 End Function
 
+
 ' If given a time double, will return the millisecond portion of the time.
-Private Function GetMilliseconds(ByVal TimeIn As Double) As Variant
+Private Function GetMilliseconds(ByRef TimeIn As Date) As Variant
+
     Dim IntDatePart As Long
     Dim DblTimePart As Double
     Dim LngSeconds As Long ' Used to remove whole seconds.
@@ -907,6 +919,7 @@ Private Function GetMilliseconds(ByVal TimeIn As Double) As Variant
     MSCount = ((DblMS * (TotalMillisecondsInDay))) \ 1
     If MSCount >= 1000 Then MSCount = 0
     GetMilliseconds = MSCount
+
 End Function
 
 
@@ -942,13 +955,15 @@ Public Function CurrentLocalBiasFromUTC(Optional ByVal OutputAsHours As Boolean
 
 End Function
 
+
 Public Function CurrentISOTimezoneOffset() As String
     CurrentISOTimezoneOffset = ISOTimezoneOffset(CurrentLocalBiasFromUTC)
 End Function
 
 
-Public Function GetBiasForGivenLocalDate(ByVal LocalDateIn As Date _
+Public Function GetBiasForGivenLocalDate(ByRef LocalDateIn As Date _
                                         , Optional ByVal OutputAsHours As Boolean = False) As Long
+
     Dim DateUTCNow As Date
 
     DateUTCNow = ConvertToUtc(LocalDateIn)
@@ -961,40 +976,44 @@ Public Function GetBiasForGivenLocalDate(ByVal LocalDateIn As Date _
     Else
         GetBiasForGivenLocalDate = VBA.DateDiff("h", LocalDateIn, DateUTCNow)
     End If
+
 End Function
 
+
 Public Function ISOTimezoneOffsetOnDate(ByVal LocalDateIn As Date) As String
     ISOTimezoneOffsetOnDate = ISOTimezoneOffset(GetBiasForGivenLocalDate(LocalDateIn))
 End Function
 
 
 ' Provides the ISO Offset time from an input (or current offset if none is passed in) to build an ISO8601 output String
+'
 Private Function ISOTimezoneOffset(Optional TimeBias As Long = 0) As String
 
-    Dim strOffsetOut As String
-
-    Dim tString_Buffer As StringBufferCache
-
     Dim OffsetLong As Long
     Dim hourOffset As Long
     Dim minOffset As Long
 
-    ' Counterintuitively, the Bias is postive (time ahead), the offset is the negative value of bias.
-    OffsetLong = TimeBias * -1
-
-    hourOffset = OffsetLong \ 60
-    minOffset = OffsetLong Mod 60
+    If TimeBias = 0 Then
 
-    If OffsetLong = 0 Then
         ISOTimezoneOffset = ISO8601UTCTimeZone
-    Else
-        If OffsetLong > 0 Then String_BufferAppend tString_Buffer, "+"
-        String_BufferAppend tString_Buffer, VBA.CStr(VBA.Format(hourOffset, "00"))
-        String_BufferAppend tString_Buffer, ISO8601TimeDelimiter
-        String_BufferAppend tString_Buffer, VBA.CStr(VBA.Format(minOffset, "00"))
 
-        ISOTimezoneOffset = String_BufferToString(tString_Buffer)
+    Else
+        ' Counterintuitively, the Bias is postive (time ahead),
+        ' and the offset is the negative value of bias.
+        OffsetLong = TimeBias * -1
+        hourOffset = OffsetLong \ 60
+        minOffset = OffsetLong Mod 60
+
+        With New clsConcat
+            If OffsetLong > 0 Then .Add "+"
+            .Add VBA.CStr(VBA.Format(hourOffset, "00"))
+            .Add ISO8601TimeDelimiter
+            .Add VBA.CStr(VBA.Format(minOffset, "00"))
+
+            ISOTimezoneOffset = .GetStr
+        End With
     End If
+
 End Function
 
 

From 0ef2d027693b774394b675eb49d03ad8cba84ad2 Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:32:52 -0500
Subject: [PATCH 55/73] Cache the format types instead of needing to build them
 every time.

---
 .../modules/modUtcConverter.bas               | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index ed4ff8ca..77015a02 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -563,18 +563,38 @@ Public Function ConvertToISO8601Time(ByVal DateIn As Date _
     End If
 
     ConvertToISO8601Time = String_BufferToString(tString_Buffer)
+
 End Function
 
 
 ' Provides a format string to other functions that complies with ISO8601
-Private Function ISOTimeFormatStr(Optional IncludeMilliseconds As Boolean = False _
-                                , Optional includeTimeZone As Boolean = False) As String
-    Dim tString_Buffer As StringBufferCache
+Public Function ISOTimeFormatStr(Optional ByVal IncludeMilliseconds As Boolean = False _
+                                , Optional ByVal IncludeTimeZonePart As Boolean = False _
+                                , Optional ByVal IncludeLocalTimeZone As Boolean = False) As String
+
+    Static f_dFormatString As Scripting.Dictionary
+
+    Dim DictPosition As Long
+
+    If f_dFormatString Is Nothing Then Set f_dFormatString = New Scripting.Dictionary
+
+    DictPosition = (4 And IncludeMilliseconds) + (2 And IncludeTimeZonePart) + (1 And IncludeLocalTimeZone)
+
+    If Not f_dFormatString.Exists(DictPosition) Then
+        With New clsConcat
+            .Add "yyyy-mm-ddTHH:mm:ss"
+            If IncludeMilliseconds Then .Add ".000"
+            If IncludeTimeZonePart And IncludeLocalTimeZone Then
+                .Add CurrentISOTimezoneOffset
+            ElseIf IncludeTimeZonePart Then
+                .Add ISO8601UTCTimeZone
+            End If
+            f_dFormatString.Add DictPosition, .GetStr
+        End With
+    End If
+
+    ISOTimeFormatStr = f_dFormatString.Item(DictPosition)
 
-    String_BufferAppend tString_Buffer, "yyyy-mm-ddTHH:mm:ss"
-    If IncludeMilliseconds Then String_BufferAppend tString_Buffer, ".000"
-    If includeTimeZone Then String_BufferAppend tString_Buffer, ISOTimezoneOffset
-    ISOTimeFormatStr = String_BufferToString(tString_Buffer)
 End Function
 
 

From 732f4e5564ced7fcad66d70c00f8609195d3ca0c Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:53:14 -0500
Subject: [PATCH 56/73] Bump Version

---
 Version Control.accda.src/dbs-properties.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index 76c27ef6..340b7a82 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.26",
+      "Value": "4.0.27",
       "Type": 10
     },
     "Auto Compact": {

From 500b891d1d91e841de71ca2b2b3316241a2f9d4a Mon Sep 17 00:00:00 2001
From: Hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:57:37 -0500
Subject: [PATCH 57/73] Verify consistent naming and byref passing of strings

---
 Version Control.accda.src/modules/modUtcConverter.bas | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Version Control.accda.src/modules/modUtcConverter.bas b/Version Control.accda.src/modules/modUtcConverter.bas
index 77015a02..2e45c59e 100644
--- a/Version Control.accda.src/modules/modUtcConverter.bas	
+++ b/Version Control.accda.src/modules/modUtcConverter.bas	
@@ -812,16 +812,16 @@ End Function
 ' Purpose   : Attempt a higher performance conversion first, then fall back to RegEx.
 '---------------------------------------------------------------------------------------
 '
-Private Function ConvTimeUTC(ByVal InVal As String) As Date
+Private Function ConvTimeUTC(ByRef InVal As String) As Date
 
     Dim varParts As Variant
-    Dim SecondsInPart As String
+    Dim InValSeconds As String
 
     If InVal Like "##:##:##.###Z" Then
         ' Use high-performance conversion to date
         varParts = Split(InVal, ":")
-        SecondsInPart = Mid(varParts(2), 1, Len(varParts(2)) - 1)
-        ConvTimeUTC = TimeSerialDbl(varParts(0), varParts(1), SecondsInPart)
+        InValSeconds = Mid(varParts(2), 1, Len(varParts(2)) - 1)
+        ConvTimeUTC = TimeSerialDbl(varParts(0), varParts(1), InValSeconds)
     Else
         ' Fall back to slower RegEx function
         ConvTimeUTC = ConvTimeUTC2(InVal)

From 4328713f091915ef9834063eb9b934b7eceba967 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:08:47 -0600
Subject: [PATCH 58/73] Implement dialect in SQL formatting

This was previously only partially implemented. #457
---
 .../modules/clsDbQuery.cls                    |  2 +-
 .../modules/clsSqlFormatter.cls               | 26 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbQuery.cls b/Version Control.accda.src/modules/clsDbQuery.cls
index cd7d08df..728716cf 100644
--- a/Version Control.accda.src/modules/clsDbQuery.cls	
+++ b/Version Control.accda.src/modules/clsDbQuery.cls	
@@ -69,7 +69,7 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
                         Case Else
                             With New clsSqlFormatter
                                 Perf.OperationStart "Format SQL"
-                                WriteFile .FormatSQL(strSql), strFile
+                                WriteFile .FormatSQL(strSql, esdAccess), strFile
                                 Perf.OperationEnd
                             End With
                     End Select
diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index ea683dba..6ee0f6d7 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -115,11 +115,8 @@ Public Function FormatSQL(Optional strSql As String, Optional intDialect As eSql
     Perf.CategoryStart "Format SQL"
     Perf.OperationStart "Formating"
 
-    ' Set SQL dialect
-    m_intDialect = intDialect
-
     ' Tokenize the string, if provided
-    If strSql <> vbNullString Then Tokenize strSql
+    If strSql <> vbNullString Then Tokenize strSql, intDialect
 
     ' Set up collection to hold types of indents
     Set colIndents = New Collection
@@ -437,7 +434,7 @@ End Function
 '           : Each token is an array with type(0) and value(1).
 '---------------------------------------------------------------------------------------
 '
-Private Sub Tokenize(strSql As String)
+Private Sub Tokenize(strSql As String, intDialect As eSqlDialect)
 
     Const cstrBreakAfter As String = "LIMIT" & ";;;;"
 
@@ -451,6 +448,9 @@ Private Sub Tokenize(strSql As String)
     m_varWordCache(1) = Empty
     m_varWordCache(2) = Empty
 
+    ' Set SQL dialect
+    m_intDialect = intDialect
+
     Perf.CategoryStart "Tokenize SQL"
 
     ' Loop through SQL, converting string into tokens
@@ -1297,16 +1297,13 @@ Public Sub SelfTest()
 
     Dim strActual As String
 
-    ' Test performance
-    TestPerformance
-
     ' Test GetNextWords
-    Tokenize "  LEFT " & vbTab & vbCrLf & " JOIN test on 1=2"
+    Tokenize "  LEFT " & vbTab & vbCrLf & " JOIN test on 1=2", esdAccess
     Debug.Assert GetNextWords(2) = "LEFT JOIN"
     Debug.Assert GetNextWords(1) = "LEFT"
 
     ' Test simple query with a few features
-    Tokenize "SELECT  5 AS `TEST`"
+    Tokenize "SELECT  5 AS `TEST`", esdMySQL
 
     ' Verify tokens
     Debug.Assert m_colTokens.Count = 7
@@ -1331,7 +1328,7 @@ Public Sub SelfTest()
 
 
     ' Test Access date literal with MySQL inline comment
-    Tokenize "SELECT (#1/1/2000#) AS SampleDate # MySQL inline ## comment"
+    Tokenize "SELECT (#1/1/2000#) AS SampleDate # MySQL inline ## comment", esdAccess
 
     ' Verify tokens
     Debug.Assert m_colTokens.Count = 11
@@ -1362,7 +1359,7 @@ Public Sub SelfTest()
     ' Example query from https://github.com/doctrine/sql-formatter
     Tokenize "SELECT count(*),`Column1`,`Testing`, `Testing Three` FROM `Table1`" & _
             " WHERE Column1 = 'testing' AND ( (`Column2` = `Column3` OR Column4 >= NOW()) )" & _
-            " GROUP BY Column1 ORDER BY Column3 DESC LIMIT 5,10"
+            " GROUP BY Column1 ORDER BY Column3 DESC LIMIT 5,10", esdMySQL
 
     ' Verify tokens
     Debug.Assert m_colTokens.Count = 66
@@ -1522,7 +1519,7 @@ Private Function BuildTestFromTokens()
     Dim intLine As Integer
 
     Debug.Print vbCrLf & vbCrLf & "    ' Verify tokens"
-    Debug.Print vbCrLf & "    Debug.Assert m_colTokens.Count = " & m_colTokens.Count
+    Debug.Print "    Debug.Assert m_colTokens.Count = " & m_colTokens.Count
 
     ' Loop through tokens
     For intToken = 1 To m_colTokens.Count
@@ -1550,6 +1547,7 @@ Private Function BuildTestFromTokens()
     Debug.Print "        strActual = .GetStr"
     Debug.Print "    End With"
     Debug.Print "    Debug.Assert (strActual = FormatSQL)"
+    Debug.Print "    If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL"
 
 End Function
 
@@ -1661,7 +1659,7 @@ Private Function TestPerformance()
     For lngCnt = 1 To lngMax
         Tokenize "SELECT count(*),`Column1`,`Testing`, `Testing Three` FROM `Table1`" & _
                 " WHERE Column1 = 'testing' AND ( (`Column2` = `Column3` OR Column4 >= NOW()) )" & _
-                " GROUP BY Column1 ORDER BY Column3 DESC LIMIT 5,10"
+                " GROUP BY Column1 ORDER BY Column3 DESC LIMIT 5,10", esdMySQL
     Next lngCnt
 
     ' Test performance of formatting SQL

From 62fe0fd9ef4da3047cf56f96cfd619ffd27cb3f6 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:10:22 -0600
Subject: [PATCH 59/73] Add support for ! boundary character

This character is used in Microsoft Access in a query when referring directly to a control on a form, and should be treated similar to a period as a separator between elements. #457
---
 .../modules/clsSqlFormatter.cls               | 76 +++++++++++++++++--
 1 file changed, 70 insertions(+), 6 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index 6ee0f6d7..dd53f9be 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -359,7 +359,8 @@ Public Function FormatSQL(Optional strSql As String, Optional intDialect As eSql
         ' If the token shouldn't have a space before it
         If strTokenValue = "." _
             Or strTokenValue = "," _
-            Or strTokenValue = ";" Then
+            Or strTokenValue = ";" _
+            Or (strTokenValue = "!" And m_intDialect = esdAccess) Then
             ' Trim any whitespace
             cReturn.RTrim
         End If
@@ -368,7 +369,9 @@ Public Function FormatSQL(Optional strSql As String, Optional intDialect As eSql
         cReturn.Add strTokenValue, " "
 
         ' If the token shouldn't have a space after it
-        If strTokenValue = "(" Or strTokenValue = "." Then
+        If strTokenValue = "(" _
+            Or strTokenValue = "." _
+            Or (strTokenValue = "!" And m_intDialect = esdAccess) Then
             cReturn.RTrim
         End If
 
@@ -512,7 +515,8 @@ Private Sub Tokenize(strSql As String, intDialect As eSqlDialect)
 
         ' A reserved word cannot be preceded by a "."
         ' This makes it so in "mytable.from", "from" is not considered a reserved word
-        ElseIf PeekChar(-1, ".") Then
+        ElseIf PeekChar(-1, ".") _
+            Or (PeekChar(-1, "!") And m_intDialect = esdAccess) Then
 
             ' Likely an object name
             If HasMatches("^(.*?)($|\s|[""\'`]|" & RegExBoundaries & ")", strMatch) Then
@@ -1461,9 +1465,69 @@ Public Sub SelfTest()
     If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL
 
 
-    'PrintTokens
-    'BuildTestFromTokens
-    'Diff.Strings strActual, FormatSQL
+    ' Test multi-part names
+    Tokenize "SELECT [dbo].[field] FROM [server].[schema].[table];", esdMSSQL
+
+    ' Verify tokens
+    Debug.Assert m_colTokens.Count = 13
+    Debug.Assert VerifyToken(1, ttReservedTopLevel, "SELECT")
+    Debug.Assert VerifyToken(2, ttWhitespace, " ")
+    Debug.Assert VerifyToken(3, ttQuote, "[dbo]")
+    Debug.Assert VerifyToken(4, ttBoundary, ".")
+    Debug.Assert VerifyToken(5, ttQuote, "[field]")
+    Debug.Assert VerifyToken(6, ttWhitespace, " ")
+    Debug.Assert VerifyToken(7, ttReservedTopLevel, "FROM")
+    Debug.Assert VerifyToken(8, ttWhitespace, " ")
+    Debug.Assert VerifyToken(9, ttQuote, "[server]")
+    Debug.Assert VerifyToken(10, ttBoundary, ".")
+    Debug.Assert VerifyToken(11, ttQuote, "[schema]")
+    Debug.Assert VerifyToken(12, ttBoundary, ".")
+    Debug.Assert VerifyToken(13, ttQuote, "[table]")
+
+    ' Verify result
+    With New clsConcat
+        .AppendOnAdd = vbCrLf
+        .Add "SELECT"
+        .Add "  [dbo].[field]"
+        .Add "FROM"
+        .Add "  [server].[schema].[table]"
+        .Remove 2
+        strActual = .GetStr
+    End With
+    Debug.Assert (strActual = FormatSQL)
+    If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL
+
+
+    ' Test parameter expression
+    Tokenize "SELECT [Forms]![frmColors]![Text18];", esdAccess
+
+    ' Verify tokens
+    Debug.Assert m_colTokens.Count = 7
+    Debug.Assert VerifyToken(1, ttReservedTopLevel, "SELECT")
+    Debug.Assert VerifyToken(2, ttWhitespace, " ")
+    Debug.Assert VerifyToken(3, ttQuote, "[Forms]")
+    Debug.Assert VerifyToken(4, ttBoundary, "!")
+    Debug.Assert VerifyToken(5, ttQuote, "[frmColors]")
+    Debug.Assert VerifyToken(6, ttBoundary, "!")
+    Debug.Assert VerifyToken(7, ttQuote, "[Text18]")
+
+    ' Verify result
+    With New clsConcat
+        .AppendOnAdd = vbCrLf
+        .Add "SELECT"
+        .Add "  [Forms]![frmColors]![Text18]"
+        .Remove 2
+        strActual = .GetStr
+    End With
+    Debug.Assert (strActual = FormatSQL)
+    If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL
+
+'    PrintTokens
+'    BuildTestFromTokens
+'    Diff.Strings strActual, FormatSQL
+
+    ' Test performance
+    TestPerformance
 
 End Sub
 

From 1c3bce6f9aa776918d365f568032cb3656a7b3e0 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:19:55 -0600
Subject: [PATCH 60/73] Add SQL formatting query to testing database

This query demonstrates that we can properly parse and format expressions that refer to controls. #457
---
 .../queries/qryFormControl.bas                | 47 +++++++++++++++++++
 .../queries/qryFormControl.sql                |  7 +++
 Testing/Testing.accdb.src/vcs-options.json    |  2 +-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 Testing/Testing.accdb.src/queries/qryFormControl.bas
 create mode 100644 Testing/Testing.accdb.src/queries/qryFormControl.sql

diff --git a/Testing/Testing.accdb.src/queries/qryFormControl.bas b/Testing/Testing.accdb.src/queries/qryFormControl.bas
new file mode 100644
index 00000000..33534acc
--- /dev/null
+++ b/Testing/Testing.accdb.src/queries/qryFormControl.bas
@@ -0,0 +1,47 @@
+Operation =1
+Option =0
+Begin InputTables
+End
+Begin OutputColumns
+    Alias ="FormControl"
+    Expression ="[Forms]![frmColors]![Text18]"
+    Alias ="TestExpression"
+    Expression ="IIf([Forms]![frmVCSInstall]![chkUseRibbon],Eval(\"True\"),False)"
+End
+dbBoolean "ReturnsRecords" ="-1"
+dbInteger "ODBCTimeout" ="60"
+dbBoolean "OrderByOn" ="0"
+dbByte "Orientation" ="0"
+dbByte "DefaultView" ="2"
+dbBoolean "FilterOnLoad" ="0"
+dbBoolean "OrderByOnLoad" ="-1"
+dbByte "RecordsetType" ="0"
+dbBoolean "TotalsRow" ="0"
+Begin
+    Begin
+        dbText "Name" ="FormControl"
+        dbLong "AggregateType" ="-1"
+        dbInteger "ColumnWidth" ="1590"
+        dbBoolean "ColumnHidden" ="0"
+    End
+    Begin
+        dbText "Name" ="TestExpression"
+        dbInteger "ColumnWidth" ="1815"
+        dbBoolean "ColumnHidden" ="0"
+        dbLong "AggregateType" ="-1"
+    End
+End
+Begin
+    State =0
+    Left =0
+    Top =0
+    Right =1368
+    Bottom =856
+    Left =-1
+    Top =-1
+    Right =1352
+    Bottom =577
+    Left =0
+    Top =0
+    ColumnsShown =539
+End
diff --git a/Testing/Testing.accdb.src/queries/qryFormControl.sql b/Testing/Testing.accdb.src/queries/qryFormControl.sql
new file mode 100644
index 00000000..0b3d12ab
--- /dev/null
+++ b/Testing/Testing.accdb.src/queries/qryFormControl.sql
@@ -0,0 +1,7 @@
+SELECT
+  [Forms]![frmColors]![Text18] AS FormControl,
+  IIf(
+    [Forms]![frmVCSInstall]![chkUseRibbon],
+    Eval("True"),
+    False
+  ) AS TestExpression;
diff --git a/Testing/Testing.accdb.src/vcs-options.json b/Testing/Testing.accdb.src/vcs-options.json
index 4a042444..3a86d9bc 100644
--- a/Testing/Testing.accdb.src/vcs-options.json
+++ b/Testing/Testing.accdb.src/vcs-options.json
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.26",
+    "AddinVersion": "4.0.27",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {

From 2a183dfa295a74f13b2843814e34663304dc7a8d Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:59:26 -0600
Subject: [PATCH 61/73] Solve rare edge case with SQL IN clause

Just in case a user has an embedded unquoted path in a string, the colon will be treated as a non-spaced boundary character during formatting. (For Microsoft Access SQL only) Fixes #447
---
 .../modules/clsSqlFormatter.cls               | 54 +++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls
index dd53f9be..ef9d3eff 100644
--- a/Version Control.accda.src/modules/clsSqlFormatter.cls	
+++ b/Version Control.accda.src/modules/clsSqlFormatter.cls	
@@ -360,7 +360,8 @@ Public Function FormatSQL(Optional strSql As String, Optional intDialect As eSql
         If strTokenValue = "." _
             Or strTokenValue = "," _
             Or strTokenValue = ";" _
-            Or (strTokenValue = "!" And m_intDialect = esdAccess) Then
+            Or (strTokenValue = "!" And m_intDialect = esdAccess) _
+            Or (strTokenValue = ":" And m_intDialect = esdAccess) Then
             ' Trim any whitespace
             cReturn.RTrim
         End If
@@ -371,7 +372,8 @@ Public Function FormatSQL(Optional strSql As String, Optional intDialect As eSql
         ' If the token shouldn't have a space after it
         If strTokenValue = "(" _
             Or strTokenValue = "." _
-            Or (strTokenValue = "!" And m_intDialect = esdAccess) Then
+            Or (strTokenValue = "!" And m_intDialect = esdAccess) _
+            Or (strTokenValue = ":" And m_intDialect = esdAccess) Then
             cReturn.RTrim
         End If
 
@@ -490,7 +492,8 @@ Private Sub Tokenize(strSql As String, intDialect As eSqlDialect)
             AddToken ttQuote, GetQuotedString
 
         ' User defined variable
-        ElseIf (NextChar("@") Or NextChar(":")) And (RemainingChars > 1) Then
+        ElseIf (NextChar("@") Or NextChar(":")) _
+            And (RemainingChars > 1) And (m_intDialect <> esdAccess) Then
 
             ' Check for quoted variable name
             If PeekChar(1, """") Or PeekChar(1, "`") Or PeekChar(1, "'") Then
@@ -516,7 +519,8 @@ Private Sub Tokenize(strSql As String, intDialect As eSqlDialect)
         ' A reserved word cannot be preceded by a "."
         ' This makes it so in "mytable.from", "from" is not considered a reserved word
         ElseIf PeekChar(-1, ".") _
-            Or (PeekChar(-1, "!") And m_intDialect = esdAccess) Then
+            Or (PeekChar(-1, "!") And m_intDialect = esdAccess) _
+            Or (PeekChar(-1, ":") And m_intDialect = esdAccess) Then
 
             ' Likely an object name
             If HasMatches("^(.*?)($|\s|[""\'`]|" & RegExBoundaries & ")", strMatch) Then
@@ -1522,6 +1526,48 @@ Public Sub SelfTest()
     Debug.Assert (strActual = FormatSQL)
     If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL
 
+
+    ' Test unquoted path (See issue #447)
+    Tokenize "SELECT foo.* INTO (C:\path\to\bar.accdb) fizz FROM bazz;", esdAccess
+
+    ' Verify tokens
+    Debug.Assert m_colTokens.Count = 21
+    Debug.Assert VerifyToken(1, ttReservedTopLevel, "SELECT")
+    Debug.Assert VerifyToken(2, ttWhitespace, " ")
+    Debug.Assert VerifyToken(3, ttWord, "foo")
+    Debug.Assert VerifyToken(4, ttBoundary, ".")
+    Debug.Assert VerifyToken(5, ttBoundary, "*")
+    Debug.Assert VerifyToken(6, ttWhitespace, " ")
+    Debug.Assert VerifyToken(7, ttReserved, "INTO")
+    Debug.Assert VerifyToken(8, ttWhitespace, " ")
+    Debug.Assert VerifyToken(9, ttBoundary, "(")
+    Debug.Assert VerifyToken(10, ttWord, "C")
+    Debug.Assert VerifyToken(11, ttBoundary, ":")
+    Debug.Assert VerifyToken(12, ttWord, "\path\to\bar")
+    Debug.Assert VerifyToken(13, ttBoundary, ".")
+    Debug.Assert VerifyToken(14, ttWord, "accdb")
+    Debug.Assert VerifyToken(15, ttBoundary, ")")
+    Debug.Assert VerifyToken(16, ttWhitespace, " ")
+    Debug.Assert VerifyToken(17, ttWord, "fizz")
+    Debug.Assert VerifyToken(18, ttWhitespace, " ")
+    Debug.Assert VerifyToken(19, ttReservedTopLevel, "FROM")
+    Debug.Assert VerifyToken(20, ttWhitespace, " ")
+    Debug.Assert VerifyToken(21, ttWord, "bazz")
+
+    ' Verify result
+    With New clsConcat
+        .AppendOnAdd = vbCrLf
+        .Add "SELECT"
+        .Add "  foo.* INTO (C:\path\to\bar.accdb) fizz"
+        .Add "FROM"
+        .Add "  bazz"
+        .Remove 2
+        strActual = .GetStr
+    End With
+    Debug.Assert (strActual = FormatSQL)
+    If (strActual <> FormatSQL) Then Diff.Strings strActual, FormatSQL
+
+
 '    PrintTokens
 '    BuildTestFromTokens
 '    Diff.Strings strActual, FormatSQL

From 3ad141c620b609ba4838dbf18623e8e2c8be502c Mon Sep 17 00:00:00 2001
From: hecon5 <54177882+hecon5@users.noreply.github.com>
Date: Wed, 15 Nov 2023 23:04:01 -0500
Subject: [PATCH 62/73] Addresses #459 (#460)

Addresses #459
---
 Version Control.accda.src/dbs-properties.json       | 2 +-
 Version Control.accda.src/modules/clsDbProperty.cls | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index 340b7a82..d76ba2e8 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.27",
+      "Value": "4.0.28",
       "Type": 10
     },
     "Auto Compact": {
diff --git a/Version Control.accda.src/modules/clsDbProperty.cls b/Version Control.accda.src/modules/clsDbProperty.cls
index 0288a0cb..cbb0ef43 100644
--- a/Version Control.accda.src/modules/clsDbProperty.cls	
+++ b/Version Control.accda.src/modules/clsDbProperty.cls	
@@ -82,7 +82,11 @@ Private Sub IDbComponent_Import(strFile As String)
     Next prp
 
     ' Read properties from source file
+    ' We don't want to parse the dates here, so turning them off for this operation only.
+    ' See issue #459 for additional details.
+    JsonOptions.ConvertDateToIso = False
     Set dImport = ReadJsonFile(strFile)
+    JsonOptions.ConvertDateToIso = True
     If Not dImport Is Nothing Then
         Set dItems = dImport("Items")
         For Each varKey In dItems.Keys
@@ -188,7 +192,11 @@ Private Sub IDbComponent_Merge(strFile As String)
 
     ' Remove any document properties that don't exist in the incoming file,
     ' then import the file.
+    ' We don't want to parse the dates here, so turning them off for this operation only.
+    ' See issue #459 for additional details.
+    JsonOptions.ConvertDateToIso = False
     Set dFile = ReadJsonFile(strFile)
+    JsonOptions.ConvertDateToIso = True
     If dFile Is Nothing Then Set dFile = New Dictionary
     RemoveMissing dFile("Items"), GetDictionary
 

From 9b6e1dd6d22e65fc5dd84a9bc3b8e96ef27823ec Mon Sep 17 00:00:00 2001
From: Tanarri <Tanarri@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:09:28 +0100
Subject: [PATCH 63/73] Allow sort of operationames with leading spaces (#463)

If a operationname has a leading space (like " MyOperation" ) the function "SortItemsByTime" fails.
Now sorting will success.
---
 Version Control.accda.src/modules/clsPerformance.cls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index fa5f62dc..fde1dfa0 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -608,7 +608,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     ' Build our list of records
     For Each varKey In dItems.Keys
         ' Create a record like this: "00062840.170000|Export Form Objects       ..."
-        strRecord = Format$(dItems(varKey).Total, "00000000.000000") & "|" & PadRight(CStr(varKey), 255)
+        strRecord = Format$(dItems(varKey).Total, "00000000.000000") & "|" & CStr(varKey)
         ' Add to array.
         varItems(lngCnt) = strRecord
         ' Increment counter for array
@@ -624,7 +624,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
     For lngCnt = dItems.Count - 1 To 0 Step -1
         ' Parse key from record (text after first pipe character)
         strRecord = varItems(lngCnt)
-        varKey = Trim$(Mid$(strRecord, InStr(1, strRecord, "|") + 1))
+        varKey = Mid$(strRecord, InStr(1, strRecord, "|") + 1)
         ' Reference performance item class
         Set cItem = dItems(varKey)
         ' Add to dictionary of resorted items

From 259a8df9fb05ad810afd41bb1d911e57e7cea345 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:29:24 -0600
Subject: [PATCH 64/73] Update comment

After removing string padding in the previous commit.
---
 Version Control.accda.src/modules/clsPerformance.cls | 2 +-
 Version Control.accda.src/vcs-options.json           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls
index fde1dfa0..41dec7a0 100644
--- a/Version Control.accda.src/modules/clsPerformance.cls	
+++ b/Version Control.accda.src/modules/clsPerformance.cls	
@@ -607,7 +607,7 @@ Private Function SortItemsByTime(dItems As Dictionary) As Dictionary
 
     ' Build our list of records
     For Each varKey In dItems.Keys
-        ' Create a record like this: "00062840.170000|Export Form Objects       ..."
+        ' Create a record like this: "00062840.170000|Export Form Objects"
         strRecord = Format$(dItems(varKey).Total, "00000000.000000") & "|" & CStr(varKey)
         ' Add to array.
         varItems(lngCnt) = strRecord
diff --git a/Version Control.accda.src/vcs-options.json b/Version Control.accda.src/vcs-options.json
index 673e5d5c..1522d637 100644
--- a/Version Control.accda.src/vcs-options.json	
+++ b/Version Control.accda.src/vcs-options.json	
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.26",
+    "AddinVersion": "4.0.27",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {

From 877610430c0a1614a59927a1730a3fcbdde208b5 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 10:19:03 -0600
Subject: [PATCH 65/73] Adjust detection of system tables

Switching to just using a bit flag check to solve #462
---
 Version Control.accda.src/forms/frmVCSOptions.bas | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Version Control.accda.src/forms/frmVCSOptions.bas b/Version Control.accda.src/forms/frmVCSOptions.bas
index 08870769..d0597872 100644
--- a/Version Control.accda.src/forms/frmVCSOptions.bas	
+++ b/Version Control.accda.src/forms/frmVCSOptions.bas	
@@ -16,10 +16,10 @@ Begin Form
     Width =10080
     DatasheetFontHeight =11
     ItemSuffix =252
-    Left =-25575
-    Top =1500
-    Right =-255
-    Bottom =14085
+    Left =3225
+    Top =2430
+    Right =18945
+    Bottom =14175
     RecSrcDt = Begin
         0x79e78b777268e540
     End
@@ -3897,7 +3897,7 @@ Private Sub LoadTableList()
                     rstTableData.AddNew
                         rstTableData!TableName = Nz(!Name)
                         rstTableData!Flags = Nz(!Flags)
-                        rstTableData!IsSystem = ((lngFlags <> 0) And (lngFlags <> 8) And (lngType = 1))
+                        rstTableData!IsSystem = BitSet(lngFlags, 2)
                         rstTableData!IsHidden = BitSet(lngFlags, 8)
                         rstTableData!IsLocal = (lngType = 1)
                         ' Determine table icon

From 64a14de930fd94ccb2d12d40b927c0785def2c35 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 10:27:55 -0600
Subject: [PATCH 66/73] Log warning for UNC path access errors

Failing to convert a path to UNC may not prevent the operation from completing, but it should be handled and logged. Fixes #461
---
 Version Control.accda.src/modules/modFileAccess.bas | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Version Control.accda.src/modules/modFileAccess.bas b/Version Control.accda.src/modules/modFileAccess.bas
index 754edcd7..85f7e436 100644
--- a/Version Control.accda.src/modules/modFileAccess.bas	
+++ b/Version Control.accda.src/modules/modFileAccess.bas	
@@ -530,11 +530,14 @@ End Function
 ' Purpose   : Returns the UNC path for a network location (if applicable)
 '---------------------------------------------------------------------------------------
 '
-Public Function GetUncPath(strPath As String)
+Public Function GetUncPath(strPath As String) As String
 
     Dim strDrive As String
     Dim strUNC As String
 
+    LogUnhandledErrors
+    On Error Resume Next
+
     strUNC = strPath
     strDrive = FSO.GetDriveName(strPath)
     If strDrive <> vbNullString Then
@@ -544,6 +547,11 @@ Public Function GetUncPath(strPath As String)
             End If
         End With
     End If
+
+    ' Log warning if unable to access a drive.
+    CatchAny eelWarning, "Unable to determine UNC path for " & strPath, ModuleName & ".GetUncPath"
+
+    ' Return UNC Path
     GetUncPath = strUNC
 
 End Function

From adfaa0110e11936146e93b813ac711db3eae69c9 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 11:54:37 -0600
Subject: [PATCH 67/73] Refactor date conversion for DB Properties

Save custom date properties in ISO (UTC) format in source files, without converting other property types like strings that may parse as dates. #459
---
 .../modules/clsDbProperty.cls                 | 21 ++++++++++++++-----
 .../modules/clsVCSIndex.cls                   |  8 +++++++
 .../modules/modJsonConverter.bas              |  2 +-
 Version Control.accda.src/vcs-options.json    |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbProperty.cls b/Version Control.accda.src/modules/clsDbProperty.cls
index cbb0ef43..a1463c3c 100644
--- a/Version Control.accda.src/modules/clsDbProperty.cls	
+++ b/Version Control.accda.src/modules/clsDbProperty.cls	
@@ -82,11 +82,7 @@ Private Sub IDbComponent_Import(strFile As String)
     Next prp
 
     ' Read properties from source file
-    ' We don't want to parse the dates here, so turning them off for this operation only.
-    ' See issue #459 for additional details.
-    JsonOptions.ConvertDateToIso = False
     Set dImport = ReadJsonFile(strFile)
-    JsonOptions.ConvertDateToIso = True
     If Not dImport Is Nothing Then
         Set dItems = dImport("Items")
         For Each varKey In dItems.Keys
@@ -100,6 +96,14 @@ Private Sub IDbComponent_Import(strFile As String)
                         varValue = dItems(varKey)("Value")
                         ' Check for relative path
                         If IsRelativePath(CStr(varValue)) Then varValue = GetPathFromRelative(CStr(varValue))
+                        ' Check for UTC date that might need to be converted back to local
+                        If dItems(varKey)("Type") = dbDate Then
+                            If (Not IsDate(varValue)) And (Right(varValue, 1) = "Z") Then
+                                ' Convert UTC date to local date
+                                dItems(varKey)("Value") = modUtcConverter.ParseIso(CStr(varValue))
+                                varValue = CDate(dItems(varKey)("Value"))
+                            End If
+                        End If
                     Else
                         ReDim bArray(0 To dItems(varKey)("Value").Count - 1)
                         For Each varItem In dItems(varKey)("Value")
@@ -148,7 +152,7 @@ Private Sub IDbComponent_Import(strFile As String)
                     End If
 
                     ' Can't add a text property with a null value. See issue #126
-                    If dItems(varKey)("Type") = 10 Then
+                    If dItems(varKey)("Type") = dbText Then
                         If varValue = vbNullChar Then blnAdd = False
                     End If
                     ' Add the property if the flag has been set.
@@ -260,6 +264,13 @@ Private Function GetDictionary(Optional blnUseCache As Boolean) As Dictionary
                         varValue = GetRelativePath(CStr(varValue))
                     End If
                 End If
+                ' Convert dates to UTC
+                If prp.Type = dbDate Then
+                    If IsDate(varValue) Then
+                        ' Store dates in JSON as UTC dates.
+                        varValue = modUtcConverter.ConvertToIsoTime(CDate(varValue))
+                    End If
+                End If
                 Set dItem = New Dictionary
                 dItem.Add "Value", varValue
                 dItem.Add "Type", prp.Type
diff --git a/Version Control.accda.src/modules/clsVCSIndex.cls b/Version Control.accda.src/modules/clsVCSIndex.cls
index ccee4137..f2bae575 100644
--- a/Version Control.accda.src/modules/clsVCSIndex.cls	
+++ b/Version Control.accda.src/modules/clsVCSIndex.cls	
@@ -106,6 +106,7 @@ Public Sub Save(Optional strInFolder As String)
     Dim varKey As Variant
     Dim varValue As Variant
     Dim strFile As String
+    Dim blnSavedValue As Boolean
 
     ' Exit if we have disabled the index functionality
     If Me.Disabled Then Exit Sub
@@ -139,11 +140,18 @@ Public Sub Save(Optional strInFolder As String)
         strFile = StripSlash(strInFolder) & PathSep & cstrFileName
     End If
 
+    ' Turn on ISO date conversion to save index dates in UTC
+    blnSavedValue = JsonOptions.ConvertDateToIso
+    JsonOptions.ConvertDateToIso = True
+
     ' Save index to file
     If m_strFile <> vbNullString Then
         WriteFile BuildJsonFile(TypeName(Me), m_dIndex, "Version Control System Index"), strFile
     End If
 
+    ' Restore previous setting
+    JsonOptions.ConvertDateToIso = blnSavedValue
+
 End Sub
 
 
diff --git a/Version Control.accda.src/modules/modJsonConverter.bas b/Version Control.accda.src/modules/modJsonConverter.bas
index 77d9f229..5dc15a3b 100644
--- a/Version Control.accda.src/modules/modJsonConverter.bas	
+++ b/Version Control.accda.src/modules/modJsonConverter.bas	
@@ -158,7 +158,7 @@ Private Type json_Options
     EscapeSolidus As Boolean
 
     ' Before version 2.3.1 dates were converted to UTC in ConvertToJson method, but not when json was parsed.
-    ' Convert datetime values to UTC/ISO8601 (false, slower) or dont change local <-> global times (true, faster)
+    ' Convert datetime values to UTC/ISO8601 (true, slower) or dont change local <-> global times (false, faster)
     ConvertDateToIso As Boolean
 
     ' Allow Unicode characters in JSON text. Set to True to use native Unicode or false for escaped values.
diff --git a/Version Control.accda.src/vcs-options.json b/Version Control.accda.src/vcs-options.json
index 1522d637..f1a2424a 100644
--- a/Version Control.accda.src/vcs-options.json	
+++ b/Version Control.accda.src/vcs-options.json	
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.27",
+    "AddinVersion": "4.0.28",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {

From b1bf7bd1f981f77aa1d822741d7c4fe8e2ffeec6 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 13:29:05 -0600
Subject: [PATCH 68/73] Turn off date ISO conversion by default

This is only used in the index and certain database properties. #459
---
 Version Control.accda.src/modules/clsDbProperty.cls | 4 ----
 Version Control.accda.src/modules/clsOptions.cls    | 1 -
 2 files changed, 5 deletions(-)

diff --git a/Version Control.accda.src/modules/clsDbProperty.cls b/Version Control.accda.src/modules/clsDbProperty.cls
index a1463c3c..645f79c3 100644
--- a/Version Control.accda.src/modules/clsDbProperty.cls	
+++ b/Version Control.accda.src/modules/clsDbProperty.cls	
@@ -196,11 +196,7 @@ Private Sub IDbComponent_Merge(strFile As String)
 
     ' Remove any document properties that don't exist in the incoming file,
     ' then import the file.
-    ' We don't want to parse the dates here, so turning them off for this operation only.
-    ' See issue #459 for additional details.
-    JsonOptions.ConvertDateToIso = False
     Set dFile = ReadJsonFile(strFile)
-    JsonOptions.ConvertDateToIso = True
     If dFile Is Nothing Then Set dFile = New Dictionary
     RemoveMissing dFile("Items"), GetDictionary
 
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 915d11ac..9769b4f8 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -654,7 +654,6 @@ Private Sub Class_Initialize()
 
     ' Other run-time options
     JsonOptions.AllowUnicodeChars = True
-    JsonOptions.ConvertDateToIso = True
 
 End Sub
 

From 5009bdc4d572cfaaa1906fe70396d07e77e80c21 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 13:38:30 -0600
Subject: [PATCH 69/73] Turn on date ISO conversion before reading index

These dates need to be converted to local dates for internal processing. #459
---
 Version Control.accda.src/modules/clsVCSIndex.cls | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Version Control.accda.src/modules/clsVCSIndex.cls b/Version Control.accda.src/modules/clsVCSIndex.cls
index f2bae575..f430c269 100644
--- a/Version Control.accda.src/modules/clsVCSIndex.cls	
+++ b/Version Control.accda.src/modules/clsVCSIndex.cls	
@@ -59,6 +59,7 @@ Public Sub LoadFromFile(Optional strFile As String)
     Dim dFile As Dictionary
     Dim dItem As Dictionary
     Dim varKey As Variant
+    Dim blnSavedValue As Boolean
 
     ' Exit if we have disabled the index functionality
     If Me.Disabled Then Exit Sub
@@ -70,7 +71,11 @@ Public Sub LoadFromFile(Optional strFile As String)
     m_strFile = strFile
     If m_strFile = vbNullString Then m_strFile = DefaultFilePath
     If FSO.FileExists(m_strFile) Then
+        ' Convert dates back to local time for processing
+        blnSavedValue = JsonOptions.ConvertDateToIso
+        JsonOptions.ConvertDateToIso = True
         Set dFile = ReadJsonFile(m_strFile)
+        JsonOptions.ConvertDateToIso = blnSavedValue
         If Not dFile Is Nothing Then
             If dFile.Exists("Items") Then
                 ' Load properties from class

From cb66895eaf8ad7e9c4ae7f577578b7e873c1dd38 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 13:40:51 -0600
Subject: [PATCH 70/73] Add saved date property to testing database

Verifies that the round trip conversion of saved date properties is working correctly. (The dates are stored as UTC in source files, but converted to local dates when imported into the database properties.) #459
---
 Testing/Testing.accdb.src/dbs-properties.json | 4 ++++
 Testing/Testing.accdb.src/vcs-options.json    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Testing/Testing.accdb.src/dbs-properties.json b/Testing/Testing.accdb.src/dbs-properties.json
index 9d3c26e0..18dcd531 100644
--- a/Testing/Testing.accdb.src/dbs-properties.json
+++ b/Testing/Testing.accdb.src/dbs-properties.json
@@ -132,6 +132,10 @@
       "Value": "",
       "Type": 15
     },
+    "SavedDateValue": {
+      "Value": "2023-11-17T19:35:41.000Z",
+      "Type": 8
+    },
     "Show Navigation Pane Search Bar": {
       "Value": 1,
       "Type": 4
diff --git a/Testing/Testing.accdb.src/vcs-options.json b/Testing/Testing.accdb.src/vcs-options.json
index 3a86d9bc..f01eb3e0 100644
--- a/Testing/Testing.accdb.src/vcs-options.json
+++ b/Testing/Testing.accdb.src/vcs-options.json
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "4.0.27",
+    "AddinVersion": "4.0.28",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {

From b32ff4a31d16c84e4d7b1e804d707340ce05734e Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 14:16:49 -0600
Subject: [PATCH 71/73] Add dates stored as text to testing database

One stored as a regular date string, and the other as an ISO8601 string. (Neither should convert when reading or writing to JSON.) #459
---
 Testing/Testing.accdb.src/dbs-properties.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Testing/Testing.accdb.src/dbs-properties.json b/Testing/Testing.accdb.src/dbs-properties.json
index 18dcd531..1b91cda3 100644
--- a/Testing/Testing.accdb.src/dbs-properties.json
+++ b/Testing/Testing.accdb.src/dbs-properties.json
@@ -72,6 +72,10 @@
       "Value": "DAO",
       "Type": 10
     },
+    "Date stored as Text": {
+      "Value": "11/17/2023 2:15:08 PM",
+      "Type": 10
+    },
     "DesignMasterID": {
       "Value": "",
       "Type": 15
@@ -84,6 +88,10 @@
       "Value": 70,
       "Type": 3
     },
+    "ISO8601 Date as Text": {
+      "Value": "2023-11-17T17:51:00.000Z",
+      "Type": 10
+    },
     "Name": {
       "Value": "rel:Testing.accdb",
       "Type": 12

From 2bf30475a4f8b4017236b9fd19e7f13ff639a345 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:29:16 -0600
Subject: [PATCH 72/73] Add default git files if dbs in repository root

If you use the default options of no special export folder path defined, the project may likely be in the repository root. Add the default .gitignore and .gitattributes files if they are missing. (This would be the default setup for most projects.)
---
 .../modules/modVCSUtility.bas                 | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 8a296512..700c507d 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -938,6 +938,7 @@ End Sub
 '           : it contains a .gitignore and .gitattributes file. If it doesn't, then
 '           : the default files are extracted and added to the project, and the user
 '           : notified that these have been added.
+'           : Checks both the export folder and the current folder.
 '---------------------------------------------------------------------------------------
 '
 Public Sub CheckGitFiles()
@@ -946,36 +947,43 @@ Public Sub CheckGitFiles()
     Dim strFile As String
     Dim blnAdded As Boolean
 
+    ' Check export folder
     strPath = Options.GetExportFolder
-    If FSO.FolderExists(strPath & ".git") Then
-
-        ' gitignore file
-        strFile = strPath & ".gitignore"
-        If Not FSO.FileExists(strFile) Then
-            ExtractResource "Default .gitignore", strPath
-            Name strFile & ".default" As strFile
-            Log.Add "Added default .gitignore file", , , "blue"
-            blnAdded = True
-        End If
-
-        ' gitattributes file
-        strFile = strPath & ".gitattributes"
-        If Not FSO.FileExists(strFile) Then
-            ExtractResource "Default .gitattributes", strPath
-            Name strFile & ".default" As strFile
-            Log.Add "Added default .gitattributes file", , , "blue"
-            blnAdded = True
+    If Not FSO.FolderExists(strPath & ".git") Then
+        ' Check current folder for repository root
+        ' (This would be the default usage)
+        strPath = CurrentProject.Path & PathSep
+        If Not FSO.FolderExists(strPath & ".git") Then
+            ' No git folder found.
+            Exit Sub
         End If
+    End If
 
-        ' Notify user
-        If blnAdded Then MsgBox2 "Added Default Git File(s)", _
-            "Added a default .gitignore and/or .gitattributes file to your project.", _
-            "By default these files exclude the binary database files from version control," & vbCrLf & _
-            "allowing you to track changes at the source file level." & vbCrLf & vbCrLf & _
-            "You may wish to customize these further for your environment.", vbInformation
+    ' gitignore file
+    strFile = strPath & ".gitignore"
+    If Not FSO.FileExists(strFile) Then
+        ExtractResource "Default .gitignore", strPath
+        Name strFile & ".default" As strFile
+        Log.Add "Added default .gitignore file", , , "blue"
+        blnAdded = True
+    End If
 
+    ' gitattributes file
+    strFile = strPath & ".gitattributes"
+    If Not FSO.FileExists(strFile) Then
+        ExtractResource "Default .gitattributes", strPath
+        Name strFile & ".default" As strFile
+        Log.Add "Added default .gitattributes file", , , "blue"
+        blnAdded = True
     End If
 
+    ' Notify user
+    If blnAdded Then MsgBox2 "Added Default Git File(s)", _
+        "Added a default .gitignore and/or .gitattributes file to your project.", _
+        "By default these files exclude the binary database files from version control," & vbCrLf & _
+        "allowing you to track changes at the source file level." & vbCrLf & vbCrLf & _
+        "You may wish to customize these further for your environment.", vbInformation
+
 End Sub
 
 

From 3f01386fc38bbdac08ec5da2c9559f5875da8006 Mon Sep 17 00:00:00 2001
From: joyfullservice <joyfullservice@users.noreply.github.com>
Date: Tue, 21 Nov 2023 09:55:40 -0600
Subject: [PATCH 73/73] Add note about Access 2007 support

See #464
---
 Wiki/Supported-Objects.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Wiki/Supported-Objects.md b/Wiki/Supported-Objects.md
index 41294c1d..1caa779b 100644
--- a/Wiki/Supported-Objects.md
+++ b/Wiki/Supported-Objects.md
@@ -16,7 +16,6 @@ Most types of objects can be exported and imported using this tool.
 |Modules  |✔️|✔️|
 |Database Settings|✔️|✔️|
 
-
 ## Detailed List
 
 If you are looking for a specific type of object or property that you want to export or import, you can refer to the following more comprehensive list. (Updates and additions welcome.)
@@ -88,4 +87,7 @@ The *Testing* column indicates whether a test item and testing code has been cre
 
 Working with *.adp files is very similar to working with regular (MDB) Microsoft Access databases. All of the main database objects can be exported and imported just like MDB files. When it comes to SQL server objects, the object definitions are exported for tracking in source control, but this system does not attempt to modify any SQL server objects. (Hence the n/a note on importing SQL objects.)
 
+## Supported Versions
+This add-in is designed to work in Microsoft Access 2010 and newer. Access 2007 users, please see [this issue](https://github.com/joyfullservice/msaccess-vcs-addin/issues/464).
+
 Missing something? Create an issue or a pull request.
\ No newline at end of file