diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 2c5766e..57bca7e 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1840,6 +1840,7 @@ void SwUnoCursorHelper::SetPropertyValues(
             aPropertyVetoExMsg += "Property is read-only: '" + rPropertyName + "' ";
             continue;
         }
+SAL_WARN("JCL","::SetPropertyValues1["<<pEntry->nWID<<"]["<<rPropertyName<<"]["<<rPropVal.Value<<"]");
         aItemSet.MergeRange(pEntry->nWID, pEntry->nWID);
         aEntries.emplace_back(pEntry, rPropVal.Value);
     }
@@ -1863,6 +1864,7 @@ void SwUnoCursorHelper::SetPropertyValues(
             }
 
             const uno::Any &rValue = aEntries[i].second;
+SAL_WARN("JCL","::SetPropertyValues2["<<aEntries[i].first->nWID<<"]["<<aEntries[i].second<<"] Causes["<<bPropertyCausesSideEffectsInNodes<<"] prev["<<bPreviousPropertyCausesSideEffectsInNodes<<"]");
             // this can set some attributes in nodes' mpAttrSet
             if (!SwUnoCursorHelper::SetCursorPropertyValue(*pEntry, rValue, rPaM, aItemSet))
                 rPropSet.setPropertyValue(*pEntry, rValue, aItemSet);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 65ca224..d872079 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1278,8 +1278,53 @@ SwXText::Impl::finishOrAppendParagraph(
     // previous paragraph
     aPam.Move( fnMoveBackward, GoInNode );
 
-    try
-    {
+//jcl
+#if 1 // This section should be removed in favour of the one below when it works.
+	    if (rProperties.getLength())
+	    {
+	        // now set the properties
+	        SfxItemPropertySet const*const pParaPropSet =
+	            aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH);
+	        const SfxItemPropertyMap &rParagraphMap =
+	            pParaPropSet->getPropertyMap();
+	        const beans::PropertyValue* pValues = rProperties.getConstArray();
+
+	        for (sal_Int32 nProp = 0; nProp < rProperties.getLength(); ++nProp)
+	        {
+	            if (!rParagraphMap.getByName(pValues[nProp].Name))
+	            {
+SAL_WARN("JCL","!!!!!!!!!!!!!!!!!!!!!!!!! This is never true - so not a problem with this document !!!!!!!!!");
+	                bIllegalException = true;
+	                break;
+	            }
+	            try
+	            {
+                        uno::Sequence< beans::PropertyValue > aValues( 1 );
+                        aValues[0] = pValues[nProp];
+
+	                //SwUnoCursorHelper::SetPropertyValue(aPam, *pParaPropSet, pValues[nProp].Name, pValues[nProp].Value);
+//SAL_WARN("JCL","["<<nProp<<"]of["<<rProperties.getLength()<<"]::finishOrAppendParagraph Prop["<<pValues[nProp].Name<<"] SetPropertyValues starting");
+                        SwUnoCursorHelper::SetPropertyValues(aPam, *pParaPropSet, aValues);
+//SAL_WARN("JCL","----["<<pValues[nProp].Name<<"] SetPropertyValues  ended");
+	            }
+	            catch (const lang::IllegalArgumentException& rIllegal)
+	            {
+	                sMessage = rIllegal.Message;
+	                bIllegalException = true;
+	                break;
+	            }
+	            catch (const uno::RuntimeException& rRuntime)
+	            {
+	                sMessage = rRuntime.Message;
+	                bRuntimeException = true;
+	                break;
+	            }
+	        }
+	    }
+#else
+try
+    {
+SAL_WARN("JCL","::finishOrAppendParagraph SetPropertyValues["<<rProperties.getLength()<<"]");
         SfxItemPropertySet const*const pParaPropSet =
             aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH);
 
@@ -1300,6 +1345,7 @@ SwXText::Impl::finishOrAppendParagraph(
         sMessage = rEx.Message;
         bRuntimeException = true;
     }
+#endif
 
     m_pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::END, nullptr);
     if (bIllegalException || bRuntimeException)