diff --git a/sw/qa/core/data/docm/testTables.docm b/sw/qa/core/data/docm/testTables.docm
index 5d4502ade055..d78f9a0abcfa 100644
Binary files a/sw/qa/core/data/docm/testTables.docm and b/sw/qa/core/data/docm/testTables.docm differ
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 0e764eb1f3aa..21798735cd09 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -116,7 +116,7 @@ void SwMacrosTest::testVba()
 
             OUString("testFontColor.docm"),
             OUString("vnd.sun.Star.script:Project.ThisDocument.testAll?language=Basic&location=document")
-        }
+        },
         // TODO - make these pass in Writer
         {
             OUString("testSentences.docm"),
@@ -133,8 +133,7 @@ void SwMacrosTest::testVba()
         {
             u"testTables.docm"_ustr,
             u"vnd.sun.Star.script:Project.ThisDocument.TestAll?language=Basic&location=document"_ustr
-        }
-
+        },
     };
     for (auto const & [ sFileBaseName, sMacroUrl ] : testInfo)
     {
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index 0cec73e88975..599991a8564b 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -101,7 +101,7 @@ SwVbaTable::getBottomPadding()
     uno::Reference< beans::XPropertySet > xPropertySet( mxTextTable, uno::UNO_QUERY_THROW);
     table::TableBorderDistances aTableBorderDistances;
     xPropertySet->getPropertyValue(u"TableBorderDistances"_ustr) >>= aTableBorderDistances;
-    return convertMm100ToPoint(aTableBorderDistances.BottomDistance);
+    return convertMm100ToPoint<double>(aTableBorderDistances.BottomDistance);
 }
 
 void SAL_CALL
@@ -120,7 +120,7 @@ SwVbaTable::getLeftPadding()
     uno::Reference< beans::XPropertySet > xPropertySet( mxTextTable, uno::UNO_QUERY_THROW);
     table::TableBorderDistances aTableBorderDistances;
     xPropertySet->getPropertyValue(u"TableBorderDistances"_ustr) >>= aTableBorderDistances;
-    return convertMm100ToPoint(aTableBorderDistances.LeftDistance);
+    return convertMm100ToPoint<double>(aTableBorderDistances.LeftDistance);
 }
 
 void SAL_CALL
@@ -139,7 +139,7 @@ SwVbaTable::getRightPadding()
     uno::Reference< beans::XPropertySet > xPropertySet( mxTextTable, uno::UNO_QUERY_THROW);
     table::TableBorderDistances aTableBorderDistances;
     xPropertySet->getPropertyValue(u"TableBorderDistances"_ustr) >>= aTableBorderDistances;
-    return convertMm100ToPoint(aTableBorderDistances.RightDistance);
+    return convertMm100ToPoint<double>(aTableBorderDistances.RightDistance);
 }
 
 void SAL_CALL
@@ -158,7 +158,7 @@ SwVbaTable::getTopPadding()
     uno::Reference< beans::XPropertySet > xPropertySet( mxTextTable, uno::UNO_QUERY_THROW);
     table::TableBorderDistances aTableBorderDistances;
     xPropertySet->getPropertyValue(u"TableBorderDistances"_ustr) >>= aTableBorderDistances;
-    return convertMm100ToPoint(aTableBorderDistances.TopDistance);
+    return convertMm100ToPoint<double>(aTableBorderDistances.TopDistance);
 }
 
 void SAL_CALL