1 files changed, 20 insertions, 7 deletions

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 358bab6c2220..17d60686e0b5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -959,8 +959,14 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
         aEvent.FeatureURL.Path == "SpacePara2")
     {
         bool bTemp = false;
-        aEvent.State >>= bTemp;
-        aBuffer.append(bTemp);
+
+        if (aEvent.IsEnabled)
+        {
+            aEvent.State >>= bTemp;
+            aBuffer.append(bTemp);
+        }
+        else
+            aBuffer.append("disabled");
     }
     else if (aEvent.FeatureURL.Path == "CharFontName")
     {
@@ -1091,6 +1097,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "InsertAuthoritiesEntry" ||
              aEvent.FeatureURL.Path == "InsertMultiIndex" ||
              aEvent.FeatureURL.Path == "InsertField" ||
+             aEvent.FeatureURL.Path == "PageNumberWizard" ||
              aEvent.FeatureURL.Path == "InsertPageNumberField" ||
              aEvent.FeatureURL.Path == "InsertPageCountField" ||
              aEvent.FeatureURL.Path == "InsertDateField" ||
@@ -1120,7 +1127,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
              aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
              aEvent.FeatureURL.Path == "Protect" ||
-             aEvent.FeatureURL.Path == "UnsetCellsReadOnly")
+             aEvent.FeatureURL.Path == "UnsetCellsReadOnly" ||
+             aEvent.FeatureURL.Path == "ContentControlProperties" ||
+             aEvent.FeatureURL.Path == "InsertCheckboxContentControl" ||
+             aEvent.FeatureURL.Path == "InsertContentControl" ||
+             aEvent.FeatureURL.Path == "InsertDateContentControl" ||
+             aEvent.FeatureURL.Path == "InsertDropdownContentControl" ||
+             aEvent.FeatureURL.Path == "InsertPictureContentControl")
     {
         aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(u"disabled"));
     }
@@ -1128,9 +1141,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "StatusSelectionMode" ||
              aEvent.FeatureURL.Path == "Signature" ||
              aEvent.FeatureURL.Path == "SelectionMode" ||
-             aEvent.FeatureURL.Path == "StatusBarFunc" ||
-             aEvent.FeatureURL.Path == "FreezePanesColumn" ||
-             aEvent.FeatureURL.Path == "FreezePanesRow")
+             aEvent.FeatureURL.Path == "StatusBarFunc")
     {
         sal_Int32 aInt32;
 
@@ -1207,7 +1218,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
             aBuffer.append("disabled");
         }
     }
-    else if (aEvent.FeatureURL.Path == "Position")
+    else if (aEvent.FeatureURL.Path == "Position" ||
+             aEvent.FeatureURL.Path == "FreezePanesColumn" ||
+             aEvent.FeatureURL.Path == "FreezePanesRow")
     {
         css::awt::Point aPoint;