diff options
| author | Noel Power <noel.power@novell.com> | 2012-10-02 18:04:55 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-10-02 18:11:06 +0100 |
| commit | ebc8ebaff65ac02d410c8e9e39c2776131955cd7 (patch) | |
| tree | 9db8d3766644022e05453890de40290fc27c1342 | |
| parent | 71b584680e4527283ccc4fa14169bc7d28d32344 (diff) | |
fdo#46278 - misc comment import/export fixes
detect whether note/comment is shown on import
export state of note ( shown/hidden )
parts of Change-Id: I59b446175217479ce7960287aa540df8c6b2b1e
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/oox/commentsbuffer.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 62933fe16850..8c758b4f4659 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -666,7 +666,8 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect break; case ESCHER_Prop_fHidden: - m_pShapeStyle->append( ";visibility:hidden" ); + if ( !it->nPropValue ) + m_pShapeStyle->append( ";visibility:hidden" ); break; default: #if OSL_DEBUG_LEVEL > 0 diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 3bbf751f2f84..39d57a0b4988 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -195,8 +195,7 @@ void Comment::finalizeImport() // position and formatting pNoteShape->convertFormatting( xAnnoShape ); // visibility - const ::oox::vml::ClientData* pClientData = pNoteShape->getClientData(); - xAnno->setIsVisible( pClientData && pClientData->mbVisible ); + bVisible = pNoteShape->getTypeModel().mbVisible; } } break; diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index f1f8a4053afe..212bb6bc2005 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -566,7 +566,7 @@ VmlCommentExporter::VmlCommentExporter( sax_fastparser::FSHelperPtr p, ScAddress void VmlCommentExporter::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) { lcl_FillProps( rProps, mpCaption, mbVisible ); - rProps.AddOpt( ESCHER_Prop_fHidden, 1 ); // bool field + rProps.AddOpt( ESCHER_Prop_fHidden, mbVisible ); // bool field VMLExport::Commit( rProps, rRect ); } |