diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 04:23:42 +0000 |
|---|---|---|
| committer | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 04:23:42 +0000 |
| commit | 7692e2c8fb4e978f272e38396b605b2140a6083c (patch) | |
| tree | f466bb177f851d5b2b28c668c542c2e8d2b2347d /sd | |
| parent | d07b6ad5bf1ef21ad39b688a6953bd4d7ef57884 (diff) | |
Fix issue #i119962#: [From Symphony]Placeholder in ppt file created by MS 2007 is lost if load in Impress.
* subversion/main/sd/source/filter/ppt/pptin.cxx
[]Set the empty text object a placeholder.
Patch by: Tang Meng <tmyl2010@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Yan Ji <yanji.yj@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>
Notes
Notes:
prefer: acb2943c8125f4ceed74f35f31776929dedeb8d8
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index b85068ba0a4a..db3cf29b881a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2385,7 +2385,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } - if ( i < 8 ) +// [Bug 119962] Placeholder in ppt file created by MS 2007 is lost if load in Impress
+ unsigned int nParaCount = pTextObj->Count();
+ PPTParagraphObj *pFirstPara = nParaCount == 0 ? NULL : pTextObj->First();
+ unsigned int nFirstParaTextcount = pFirstPara == NULL ? 0 : pFirstPara->GetTextSize();
+ if ( i < 8 || (nParaCount == 1 && nFirstParaTextcount == 0 || nParaCount == 0)) { PresObjKind ePresObjKind = PRESOBJ_NONE; sal_Bool bEmptyPresObj = sal_True; |