oox/source/export/vmlexport.cxx | 3 ++- sc/source/filter/oox/commentsbuffer.cxx | 3 +-- sc/source/filter/xcl97/xcl97rec.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit ebc8ebaff65ac02d410c8e9e39c2776131955cd7 Author: Noel Power <noel.po...@novell.com> Date: Tue Oct 2 18:04:55 2012 +0100 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.me...@suse.com> diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 62933fe..8c758b4 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 3bbf751..39d57a0 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 f1f8a40..212bb6b 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 ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits