[libreoffice/f17] Resolves: rhbz#854451 fdo#46278 Calc: import/export .xlsx comment visibility
Eike Rathke
erack at fedoraproject.org
Wed Oct 31 20:36:14 UTC 2012
commit ee88ff48c6ad06e34f656a8a386b6caf9af74a3e
Author: Eike Rathke <erack at redhat.com>
Date: Wed Oct 31 21:35:36 2012 +0100
Resolves: rhbz#854451 fdo#46278 Calc: import/export .xlsx comment visibility
...-fdo-46278-misc-comment-import-export-fix.patch | 87 ++++++++++++++++++++
libreoffice.spec | 5 +-
2 files changed, 91 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch b/0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch
new file mode 100644
index 0000000..2ef3a89
--- /dev/null
+++ b/0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch
@@ -0,0 +1,87 @@
+From 89b99a414e38b12df13a097ada1d6f2f72039408 Mon Sep 17 00:00:00 2001
+Message-Id: <89b99a414e38b12df13a097ada1d6f2f72039408.1351714946.git.erack at redhat.com>
+From: Noel Power <noel.power at novell.com>
+Date: Tue, 2 Oct 2012 18:04:55 +0100
+Subject: [PATCH] rhbz#854451 fdo#46278 - misc comment import/export fixes
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+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 at suse.com>
+(cherry picked from commit ebc8ebaff65ac02d410c8e9e39c2776131955cd7)
+
+Conflicts:
+
+ sc/source/filter/oox/commentsbuffer.cxx
+
+Change of sc/source/filter/oox/commentsbuffer.cxx merged to
+oox/source/xls/commentsbuffer.cxx instead.
+
+Change-Id: Ief52da32fcb43d6c066f84205cf2d1cfee6ed126
+Signed-off-by: Eike Rathke <erack at redhat.com>
+---
+ oox/source/export/vmlexport.cxx | 3 ++-
+ oox/source/xls/commentsbuffer.cxx | 3 +--
+ sc/source/filter/xcl97/xcl97rec.cxx | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch"
+
+diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
+index 554d49f..0b4b470 100644
+--- a/oox/source/export/vmlexport.cxx
++++ b/oox/source/export/vmlexport.cxx
+@@ -662,7 +662,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/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
+index 55dd28b..067cafe 100644
+--- a/oox/source/xls/commentsbuffer.cxx
++++ b/oox/source/xls/commentsbuffer.cxx
+@@ -268,8 +268,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 56f30fe..106d63e 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 );
+ }
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 4d3e670..7adbd39 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -166,6 +166,7 @@ Patch48: 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch
Patch49: 0001-rhbz-868953-fdo-45084-When-the-caller-specifies-filt.patch
Patch50: 0001-fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.patch
Patch51: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
+Patch52: 0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1047,6 +1048,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch49 -p1 -b .rhbz-868953-fdo-45084-When-the-caller-specifies-filt.patch
%patch50 -p1 -b .fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.patch
%patch51 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch
+%patch52 -p1 -b .rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -2333,9 +2335,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
-* Mon Oct 29 2012 Stephan Bergmann <sbergman at redhat.com> - 1:3.5.7.2-5-UNBUILT
+* Wed Oct 31 2012 Stephan Bergmann <sbergman at redhat.com> - 1:3.5.7.2-5-UNBUILT
- Resolves: fdo#49517 Java macro embedded in document will not run
- Resolves: rhbz#865058 increase number of user-defined format codes
+- Resolves: rhbz#854451 fdo#46278 Calc: import/export .xlsx comment visibility
* Wed Oct 24 2012 Eike Rathke <erack at redhat.com> - 1:3.5.7.2-4
- Resolves: rhbz#868953 Calc: open HTML documents from file dialog
More information about the scm-commits
mailing list