some fixes

Author: ahaenggli

.gitignore

@@ -0,0 +1 @@
+~$*

Class Modules/TocSheetAppEventHandler.cls

@@ -15,16 +15,24 @@ Attribute AppEvent.VB_VarHelpID = -1
 
 'handles changes in the Toc sheet (update custom properties if edited manually)
 Private Sub AppEvent_SheetChange(ByVal Sh As Object, ByVal Target As Range)
+On Error GoTo Hoppla
+    'called from toc handler
+    If isF5 Then Exit Sub
+    'error...
+    If Sh Is Nothing Then Exit Sub
 
     'not a worksheet?
     If Not TypeOf Sh Is Worksheet Then Exit Sub
-    'not Toc page?
-    If Sh.Name <> getTocSheetName() Then Exit Sub
+    
+    'parent not a workbook
+    If Not TypeOf Sh.Parent Is Workbook Then Exit Sub
+        
     'is there already a table? If not -> just exit sub
     If Sh.ListObjects.count = 0 Then Exit Sub
 
-    If isF5 Then Exit Sub
-    
+    'not Toc page? (last check because in worstcase it iterates all worksheets)
+    If Sh.Name <> getTocSheetName() Then Exit Sub
+        
     Dim cl As Range
 
     Dim arrIdxCols As Variant
@@ -73,7 +81,7 @@ Private Sub AppEvent_SheetChange(ByVal Sh As Object, ByVal Target As Range)
                     End If
 
 Skip:
-                On Error GoTo 0
+                On Error GoTo Hoppla
             Next cl
 
 
@@ -96,19 +104,23 @@ If Right(newCusProp, 1) = ";" Then newCusProp = Left(newCusProp, Len(newCusProp)
 setProperty Sh, "TocColumns", Join(arrIdxCols, ";")
 setProperty Sh, "TocCustomProperties", newCusProp
 
-
+Hoppla:
 Application.ScreenUpdating = True
 Application.DisplayAlerts = True
 End Sub
 
 'constructor:
 Public Sub Class_Initialize()
+On Error GoTo Hoppla
     'bind events from "Application" to this class var "AppEvent"
     Set AppEvent = Application
+Hoppla:
 End Sub
 
 ' New WorkBook added in Application: with it also the first WorkSheet was created
 Private Sub AppEvent_NewWorkbook(ByVal WB As Workbook)
+On Error GoTo Hoppla
+    
     Dim cPrpNm As String
     cPrpNm = getWorksheetCreatedDatePropName()
 
@@ -118,10 +130,14 @@ Private Sub AppEvent_NewWorkbook(ByVal WB As Workbook)
    End If
 
    setProperty WB.Sheets(1), "isToc", "0"
+
+Hoppla:
+
 End Sub
 
 ' new WorkSheet added
 Private Sub AppEvent_WorkbookNewSheet(ByVal WB As Workbook, ByVal Sh As Object)
+On Error GoTo Hoppla
 If Not TypeOf Sh Is Worksheet Then Exit Sub
 Dim cPrpNm As String
 cPrpNm = getWorksheetCreatedDatePropName()
@@ -136,11 +152,12 @@ cPrpNm = getWorksheetCreatedDatePropName()
     If worksheetExists(WB, getTocSheetName()) Then
         Call generateTocWorksheet
     End If
-    
+Hoppla:
 End Sub
 
 'refresh table of contents sheet if activated
 Private Sub AppEvent_SheetActivate(ByVal Sh As Object)
+On Error GoTo Hoppla
     'not a worksheet?
     If Not TypeOf Sh Is Worksheet Then Exit Sub
     'not a workbook?
@@ -152,8 +169,9 @@ Private Sub AppEvent_SheetActivate(ByVal Sh As Object)
 
     'there is no sheet for table of contents?
     If Not worksheetExists(Sh.Parent, idx) Then Exit Sub
-    
+   
     If Sh.Name = idx Then
      Call generateTocWorksheet
     End If
+Hoppla:
 End Sub

DieseArbeitsmappe.cls

@@ -7,7 +7,7 @@ Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = True
-'' Source can be found at https://gitlab.com/haenggli.net/excel/tableofcontents-generator-addin
+'' Source can be found at https://github.com/ahaenggli/Excel-PlugIn-TableOfContents
 
 Option Explicit
 
@@ -23,11 +23,11 @@ Private Sub Workbook_Open()
 
     '' CTRL + Shift + A
     'Application.OnKey "^+{A}", "tstBox"
-     Application.OnKey "{F5}", "handleF5Click"
+     Application.OnKey getGlobalTocHandlerPropName(), "handleF5Click"
      isF5 = False
     'init application wide event handler
      Set TocSheetExtension_AppEventHandler = New TocSheetAppEventHandler
-       
+
 End Sub
 
 

Forms/PropertyExtensionForm.frx

@@ -1,10 +1,10 @@
 VERSION 5.00
 Begin {C62A69F0-16DC-11CE-9E98-00AA00574A4F} TocSheetExtensionForm 
    Caption         =   "edit custom values for index sheet"
-   ClientHeight    =   3420
+   ClientHeight    =   4590
    ClientLeft      =   120
    ClientTop       =   465
-   ClientWidth     =   6555
+   ClientWidth     =   6435
    OleObjectBlob   =   "TocSheetExtensionForm.frx":0000
    StartUpPosition =   1  'Fenstermitte
 End
@@ -28,7 +28,8 @@ Private Sub UserForm_Activate()
     txtProperties.Text = Join(getTocCustomProperties(), ";")
     txtSummaryColumns.Text = Join(getTocColumns(), ";")
     txtWorkSheetCreatedDate.Text = getWorksheetCreatedDatePropName()
-        
+    txtCallToc.Text = getGlobalTocHandlerPropName()
+    
      If Not worksheetExists(ActiveWorkbook, getTocSheetName()) Then
         Me.cbSetDefault.Value = True
      End If
@@ -39,18 +40,19 @@ Private Sub saveSettings()
     If Not worksheetExists(ActiveWorkbook, getTocSheetName()) And Me.cbSetDefault.Value = False Then
         Call generateTocWorksheet
     End If
-
-    If worksheetExists(ActiveWorkbook, getTocSheetName()) Then
-    setProperty ActiveWorkbook.Worksheets(1), "TocWorksheetName", txtSumTitel.Text
-    setProperty ActiveWorkbook.Worksheets(1), "TocCustomProperties", txtProperties.Text
-    setProperty ActiveWorkbook.Worksheets(1), "TocColumns", txtSummaryColumns.Text
-    setProperty ActiveWorkbook.Worksheets(1), "WorksheetCreatedDatePropName", txtWorkSheetCreatedDate.Text
+    
+    If worksheetExists(ActiveWorkbook, getTocSheetName()) And Me.cbSetDefault.Value = False Then
+        If txtSumTitel.Text <> "" Then setProperty ActiveWorkbook.Worksheets(1), "TocWorksheetName", txtSumTitel.Text
+        If txtProperties.Text <> "" Then setProperty ActiveWorkbook.Worksheets(1), "TocCustomProperties", txtProperties.Text
+        If txtSummaryColumns.Text <> "" Then setProperty ActiveWorkbook.Worksheets(1), "TocColumns", txtSummaryColumns.Text
 
-    On Error Resume Next
-    Application.DisplayAlerts = False
-    ActiveWorkbook.Save
-    Application.DisplayAlerts = True
-    On Error GoTo 0
+        setProperty ActiveWorkbook.Worksheets(1), "WorksheetCreatedDatePropName", txtWorkSheetCreatedDate.Text
+            
+        On Error Resume Next
+            Application.DisplayAlerts = False
+            ActiveWorkbook.Save
+            Application.DisplayAlerts = True
+        On Error GoTo 0
     End If
 
     If Me.cbSetDefault.Value = True Then
@@ -59,11 +61,17 @@ Private Sub saveSettings()
     ' -> ThisWorkbook is where the code is saved (xlam-file)
     ' -> even a xlam file has at least one sheet
     ' -> here it's named "TocConfig"
-    setProperty ThisWorkbook.Worksheets(1), "TocWorksheetName", txtSumTitel.Text
-    setProperty ThisWorkbook.Worksheets(1), "TocCustomProperties", txtProperties.Text
-    setProperty ThisWorkbook.Worksheets(1), "TocColumns", txtSummaryColumns.Text
-    setProperty ThisWorkbook.Worksheets(1), "WorksheetCreatedDatePropName", txtWorkSheetCreatedDate.Text
+    If txtSumTitel.Text <> "" And txtSumTitel.Text <> getTocSheetName() Then setProperty ThisWorkbook.Worksheets(1), "TocWorksheetName", txtSumTitel.Text
+    If txtProperties.Text <> "" And txtProperties.Text <> Join(getTocCustomProperties(), ";") Then setProperty ThisWorkbook.Worksheets(1), "TocCustomProperties", txtProperties.Text
+    If txtSummaryColumns.Text <> "" And txtSummaryColumns.Text <> Join(getTocColumns(), ";") Then setProperty ThisWorkbook.Worksheets(1), "TocColumns", txtSummaryColumns.Text
+    If txtWorkSheetCreatedDate.Text <> getWorksheetCreatedDatePropName() Then setProperty ThisWorkbook.Worksheets(1), "WorksheetCreatedDatePropName", txtWorkSheetCreatedDate.Text
 
+    If txtCallToc.Text <> "" And txtCallToc.Text <> getGlobalTocHandlerPropName() Then
+        Application.OnKey getGlobalTocHandlerPropName()
+        setProperty ThisWorkbook.Worksheets(1), "GlobalTocHandlerPropName", txtCallToc.Text
+        Application.OnKey getGlobalTocHandlerPropName(), "handleF5Click"
+    End If
+    
     On Error Resume Next
     Application.DisplayAlerts = False
     ThisWorkbook.Save

Forms/TocSheetExtensionForm.frm

@@ -15,6 +15,26 @@ Public Sub handleF5Click()
     isF5 = False
 End Sub
 
+'get the name for the global toc handler (default: F5) (custom property)
+Public Function getGlobalTocHandlerPropName() As String
+    Dim prop As String
+    prop = ""
+    
+    On Error Resume Next
+    ' only global possible
+    If prop = "" Then prop = getProperty(ThisWorkbook.Worksheets(1), "GlobalTocHandlerPropName")
+    If prop = "" Then prop = "{F5}"
+
+    If Err.Number > 0 Then
+        prop = "{F5}"
+        Err.Clear
+    End If
+    On Error GoTo 0
+    
+    getGlobalTocHandlerPropName = prop
+End Function
+
+
 'get the name for the worksheet created field (custom property)
 Public Function getWorksheetCreatedDatePropName() As String
     Dim prop As String