diff options
| author | Bisal Nayal <bisal.nayal@synerzip.com> | 2014-07-11 16:27:34 +0530 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-07-21 15:03:25 +0000 |
| commit | 245df9b4b37e3b1a6863aec5802346999bd71477 (patch) | |
| tree | 13f82da9dfc4b45b49fbda06e3215096de70ce9a /include | |
| parent | 8ed122f34275f4b4afd1a84d3b5254e4a814ba43 (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 'include')
| -rw-r--r-- | include/filter/msfilter/util.hxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index ddf5a120ac5c..c1bb36dbc929 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -17,6 +17,7 @@ #include <filter/msfilter/msfilterdllapi.h> #include <svx/msdffdef.hxx> #include <com/sun/star/awt/Size.hpp> +#include <filter/msfilter/escherex.hxx> namespace msfilter { namespace util { @@ -138,6 +139,13 @@ MSFILTER_DLLPUBLIC const char* GetOOXMLPresetGeometry( const char* sShapeType ); /// Similar to EnhancedCustomShapeTypeNames::Get(), but returns an MSO_SPT (binary / VML type). MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(const OString& aType); +/** + * The following function checks if a MSO shapetype is allowed to have textboxcontent. + * + * @param nShapeType shape to check + */ +MSFILTER_DLLPUBLIC bool HasTextBoxContent(sal_uInt32 nShapeType); + } } |