diff options
| author | Nikhil Walvekar <nikhil.walvekar@synerzip.com> | 2014-01-10 20:21:45 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 18:17:42 +0100 |
| commit | 3cf58da99ef152db31fa8378045d4bff041f7ff4 (patch) | |
| tree | 8cd1366664e98e93692071e529e248f8d7ddabb7 /include/oox | |
| parent | 8313f68355a7f1f51e930c74f215d823ff086457 (diff) | |
fdo#70942 Preserve original shape type, if shape contains text.
Currently we change shape type to textframe if a shape contains
text. Due to this shape information is not preserved when file
is saved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7372
Change-Id: I7af3ce29f857d6fa2ceab0350937d91638361e7c
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/customshapeproperties.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx index e6df846c7fa2..fdf8d49196eb 100644 --- a/include/oox/drawingml/customshapeproperties.hxx +++ b/include/oox/drawingml/customshapeproperties.hxx @@ -135,6 +135,8 @@ public: sal_Int32 getShapePresetType() const { return mnShapePresetType; } OUString getShapePresetTypeName() const; void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType = nShapePresetType; }; + sal_Bool getShapeTypeOverride(){ return mbShapeTypeOverride; }; + void setShapeTypeOverride( sal_Bool bShapeTypeOverride ) { mbShapeTypeOverride = bShapeTypeOverride; }; std::vector< CustomShapeGuide >& getAdjustmentGuideList(){ return maAdjustmentGuideList; }; std::vector< CustomShapeGuide >& getGuideList(){ return maGuideList; }; @@ -155,6 +157,7 @@ public: private: sal_Int32 mnShapePresetType; + sal_Bool mbShapeTypeOverride; std::vector< CustomShapeGuide > maAdjustmentGuideList; std::vector< CustomShapeGuide > maGuideList; std::vector< AdjustHandle > maAdjustHandleList; |