Attachment 112558 Details for Bug 84942 – a patch that allows the content to be imported, but not laid out right

[patch] a patch that allows the content to be imported, but not laid out right

0001-moving-mbTextBox-to-base-class-will-allow-content-to.patch (text/plain), 3.76 KB, created by Caolán McNamara on 2015-01-20 17:07:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2015-01-20 17:07:29 UTC

Size: 3.76 KB

patch

obsolete

>From 0125a3ad749f187a886aa23ccacdd7140708393f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
>Date: Tue, 20 Jan 2015 17:02:23 +0000
>Subject: [PATCH] moving mbTextBox to base class will allow content to be
> imported
>
>but its mangled into the wrong width and position, so that's rather
>hopeless
>
>Change-Id: I03b73f15130ee54d037673c7378a746d857b0e4c
>---
> xmloff/source/draw/ximpshap.cxx | 48 ++++++++++++++++++++---------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
>
>diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
>index 316b379..b3ad17e 100644
>--- a/xmloff/source/draw/ximpshap.cxx
>+++ b/xmloff/source/draw/ximpshap.cxx
>@@ -164,6 +164,29 @@ SdXMLShapeContext::SdXMLShapeContext(
>     , mbHaveXmlId(false)
>     , mbTextBox(false)
> {
>+    // See the XMLTextFrameContext ctor, a frame has Writer content (and not
>+    // editeng) if its autostyle has a parent style. Do the same for shapes as well.
>+    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
>+    for (sal_Int16 i=0; i < nAttrCount; ++i)
>+    {
>+        const OUString& rAttrName = xAttrList->getNameByIndex(i);
>+        OUString aLocalName;
>+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
>+        if (nPrefix == XML_NAMESPACE_DRAW && IsXMLToken(aLocalName, XML_STYLE_NAME))
>+        {
>+            OUString aStyleName = xAttrList->getValueByIndex(i);
>+            if(!aStyleName.isEmpty())
>+            {
>+                rtl::Reference<XMLTextImportHelper> xTxtImport = GetImport().GetTextImport();
>+                XMLPropStyleContext* pStyle = xTxtImport->FindAutoFrameStyle(aStyleName);
>+                if (pStyle && !pStyle->GetParentName().isEmpty())
>+                {
>+                    mbTextBox = true;
>+                    break;
>+                }
>+            }
>+        }
>+    }
> }
> 
> SdXMLShapeContext::~SdXMLShapeContext()
>@@ -718,7 +741,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
>             // Writer shapes: if this one has a TextBox, set it here.
>             uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropSet->getPropertySetInfo();
>             if (xPropertySetInfo->hasPropertyByName("TextBox"))
>-                xPropSet->setPropertyValue("TextBox", uno::makeAny(mbTextBox));
>+                xPropSet->setPropertyValue("TextBox", uno::makeAny(mbTextBox)); //ONE
> 
>         } while(false);
> 
>@@ -3719,29 +3742,6 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext(
>     bool bTemporaryShape)
> :   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
> {
>-    // See the XMLTextFrameContext ctor, a frame has Writer content (and not
>-    // editeng) if its autostyle has a parent style. Do the same for shapes as well.
>-    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
>-    for (sal_Int16 i=0; i < nAttrCount; ++i)
>-    {
>-        const OUString& rAttrName = xAttrList->getNameByIndex(i);
>-        OUString aLocalName;
>-        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
>-        if (nPrefix == XML_NAMESPACE_DRAW && IsXMLToken(aLocalName, XML_STYLE_NAME))
>-        {
>-            OUString aStyleName = xAttrList->getValueByIndex(i);
>-            if(!aStyleName.isEmpty())
>-            {
>-                rtl::Reference<XMLTextImportHelper> xTxtImport = GetImport().GetTextImport();
>-                XMLPropStyleContext* pStyle = xTxtImport->FindAutoFrameStyle(aStyleName);
>-                if (pStyle && !pStyle->GetParentName().isEmpty())
>-                {
>-                    mbTextBox = true;
>-                    break;
>-                }
>-            }
>-        }
>-    }
> }
> 
> SdXMLCustomShapeContext::~SdXMLCustomShapeContext()
>-- 
>1.9.3
>

Actions: View | Splinter Review

Attachments on bug 84942: 107745 | 112558

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.