summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorBisal Nayal <bisal.nayal@synerzip.com>2014-07-11 16:27:34 +0530
committerLuboš Luňák <l.lunak@collabora.com>2014-07-21 15:03:25 +0000
commit245df9b4b37e3b1a6863aec5802346999bd71477 (patch)
tree13f82da9dfc4b45b49fbda06e3215096de70ce9a /filter
parent8ed122f34275f4b4afd1a84d3b5254e4a814ba43 (diff)
fdo#78663 : The File gets corrupted when saved in LO
Problem Description: The docx file contains a word art inside a drawing tool. After RT, nesting of <txbxContent> tag is happening which is causing the corruption. Solution: Created a service in util.cxx for checking few shapetypes for which textbox with content is not allowed. This check also helps to find that if we are already inside a DML then we should purely read VML Information.An existing UT testWordArtWithinDraingtool was failing. The UT is related to same issue (word art inside drawing tool) hence changed it accordingly. Following is the commit id of the UT-Change-Id: I00e94712e912ad1977fcb65a945fefb927795d77 Change-Id: I7e456c9f6a69af80da443e29eb02a64ba7d59468 Reviewed-on: https://gerrit.libreoffice.org/10229 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/util.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 5aad6fe4f0d5..9f3a640155d1 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1333,6 +1333,18 @@ MSO_SPT GETVMLShapeType(const OString& aType)
return i == pDMLToVMLMap->end() ? mso_sptNil : i->second;
}
+bool HasTextBoxContent(sal_uInt32 nShapeType)
+{
+ switch (nShapeType)
+ {
+ case ESCHER_ShpInst_TextPlainText:
+ case ESCHER_ShpInst_TextSlantUp:
+ case ESCHER_ShpInst_TextDeflateInflateDeflate:
+ return false;
+ default:
+ return true;
+ }
+}
}
}