fdo#78900 RTF import: allow \dpxsize inside \dptxbxtext

Previously we assumed that they always appear under \do directly.

Change-Id: Ie3a978da856986f604a3815d6127abb4191323c0

sw/qa/core/data/rtf/pass/fdo78900.rtf

+{\rtf1\ansi\ansicpg1252\deff0\deftab720
+\viewkind1\paperw11910\paperh16845\margl225\margr225\margt225\margb225\headery0\footery0
+{
+{\*\do\dobxpage\dobypage\dptxbx
+{\dptxbxtext\dpx227\dpy227\dpxsize11911\dpysize9709\dplinehollow
+{hello
+}
+}
+}
+\par}
+}

writerfilter/source/rtftok/rtfdocumentimpl.cxx

@@ -5580,6 +5580,17 @@ int RTFDocumentImpl::popState()
                 m_aStates.top().pCurrentBuffer->push_back(
                     Buf_t(BUFFER_ENDSHAPE));
         }
+
+        // It's allowed to declare these inside the the shape text, and they
+        // are expected to have an effect for the whole shape.
+        if (aState.aDrawingObject.nLeft)
+            m_aStates.top().aDrawingObject.nLeft = aState.aDrawingObject.nLeft;
+        if (aState.aDrawingObject.nTop)
+            m_aStates.top().aDrawingObject.nTop = aState.aDrawingObject.nTop;
+        if (aState.aDrawingObject.nRight)
+            m_aStates.top().aDrawingObject.nRight = aState.aDrawingObject.nRight;
+        if (aState.aDrawingObject.nBottom)
+            m_aStates.top().aDrawingObject.nBottom = aState.aDrawingObject.nBottom;
         break;
     default:
     {