diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 03:49:09 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-06-03 00:04:06 +0200 |
| commit | f39f7ba614749d99362a2059919521eee6bdb6fc (patch) | |
| tree | e9214ebd21ff013462058723df68d6f28ab13841 /include/oox | |
| parent | C4702: unreachable code (diff) | |
| download | core-f39f7ba614749d99362a2059919521eee6bdb6fc.tar.gz core-f39f7ba614749d99362a2059919521eee6bdb6fc.zip | |
Fix issue #i120723#: Table style is lost when import PPTX by AOO
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx
* subversion/main/oox/source/drawingml/table/tableproperties.cxx
[]if the imported table in pptx just have tableStyleId, should fill the tablestyle's content.
Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by:Ma Bingbing <jiazema@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 74b1435a4d39eac71e36fb1c387b24af4b353fa0)
Conflicts:
oox/inc/oox/drawingml/table/tableproperties.hxx
oox/source/drawingml/table/tableproperties.cxx
Change-Id: I554169522a95343662781c3f169c6485c38a6800
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/table/tableproperties.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx index 8c584b1f8959..da5462ba0da7 100644 --- a/include/oox/drawingml/table/tableproperties.hxx +++ b/include/oox/drawingml/table/tableproperties.hxx @@ -57,7 +57,7 @@ public: private: - const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase ); + const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase, sal_Bool &isCreateTabStyle); OUString maStyleId; // either StyleId is available boost::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle |