/[packages]/updates/2/libreoffice/current/SOURCES/0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch
ViewVC logotype

Contents of /updates/2/libreoffice/current/SOURCES/0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 395235 - (show annotations) (download)
Thu Feb 7 22:09:33 2013 UTC (11 years, 2 months ago) by dmorgan
File size: 3555 byte(s) 
- Resolves: rhbz#760765 Impress doesn't copy custom styles from one file
  to another
- Resolves: rhbz#810739 Incorrect displaying attached rtf document
- Resolves: rhbz#876606 regressions in MSO binary import filters
- Resolves: rhbz#890080 crash in SwXTextDocument::getRendererCount
- Resolves: fdo#58730 ODF fo:margin 100% bug
- Resolves: fdo#59366: Document Conversion wizard: enable "StarOffice" again
- Resolves: rhbz#894223 crash on export of .docx
- Resolves: rendering documents in browser plug-in
- Resolves: rhbz#882240 end of undo stack crash
- Resolves: rhbz#875140 fix position of cell-anchored charts
- 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
- Resolves: rhbz#864858 Calc: import more than 256 sheets from .xlsx
- Resolves: rhbz#868953 Calc: open HTML documents from file dialog
- Resolves: rhbz#868479 guard against duplicated ~ in OK/Cancel
- Resolves: rhbz#863052 fix ZipIOException on mismatched timestamps
- Resolves: rhbz#820283 Writer: fix crashes in DOCX table import
- Resolves: rhbz#861680 Writer: DOCX import: fix crash on tables in substreams
- Related: rhbz#826526 Inform user about unsupported PDF encryption formats
- Resolves: rhbz#852128 Writer: avoid table undo crash
- Resolves: rhbz#689053 Writer: fix crash following delete at last table cell
- Resolves: rhbz#820283 Writer: fix crashes in DOCX table import
- Resolves: rhbz#827695 Writer: prevent crashes after incomplete print
- Resolves: fdo#54565 text misaligned in pptx
- Resolves: rhbz#855541 XIOError handler multithread woes
- Resolves: rhbz#836827 Connection to datasource could not be established using
  gcj
- Related: rhbz#850709 hunspell en-US available standalone so
  make English langpack require hunspell-en and core just
  bare bones hunspell-en-US
- Resolves: rhbz#855507 large ole2 compound files fail to load
- Resolves: rhbz#855972 crash on switching to outline view
- Resolves: rhbz#846775 Clipboard must be disposed before Selection
- Resolves: rhbz#842292 crash in scrolling multiselection in draw
- Resolves: rhbz#842552 crash in pptx import
- Resolves: rhbz#832603 abi problems with c++11
- Resolves: rhbz#836937 insanely slow with Zemberek

SILENT: Sync with fedora
1 From 89b99a414e38b12df13a097ada1d6f2f72039408 Mon Sep 17 00:00:00 2001
2 Message-Id: <89b99a414e38b12df13a097ada1d6f2f72039408.1351714946.git.erack@redhat.com>
3 From: Noel Power <noel.power@novell.com>
4 Date: Tue, 2 Oct 2012 18:04:55 +0100
5 Subject: [PATCH] rhbz#854451 fdo#46278 - misc comment import/export fixes
6 MIME-Version: 1.0
7 Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
8
9 This is a multi-part message in MIME format.
10 --------------erAck-patch-parts
11 Content-Type: text/plain; charset=UTF-8; format=fixed
12 Content-Transfer-Encoding: 8bit
13
14
15 detect whether note/comment is shown on import
16 export state of note ( shown/hidden )
17
18 parts of Change-Id: I59b446175217479ce7960287aa540df8c6b2b1e
19 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
20 (cherry picked from commit ebc8ebaff65ac02d410c8e9e39c2776131955cd7)
21
22 Conflicts:
23
24 sc/source/filter/oox/commentsbuffer.cxx
25
26 Change of sc/source/filter/oox/commentsbuffer.cxx merged to
27 oox/source/xls/commentsbuffer.cxx instead.
28
29 Change-Id: Ief52da32fcb43d6c066f84205cf2d1cfee6ed126
30 Signed-off-by: Eike Rathke <erack@redhat.com>
31 ---
32 oox/source/export/vmlexport.cxx | 3 ++-
33 oox/source/xls/commentsbuffer.cxx | 3 +--
34 sc/source/filter/xcl97/xcl97rec.cxx | 2 +-
35 3 files changed, 4 insertions(+), 4 deletions(-)
36
37
38 --------------erAck-patch-parts
39 Content-Type: text/x-patch; name="0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch"
40 Content-Transfer-Encoding: 8bit
41 Content-Disposition: attachment; filename="0001-rhbz-854451-fdo-46278-misc-comment-import-export-fix.patch"
42
43 diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
44 index 554d49f..0b4b470 100644
45 --- a/oox/source/export/vmlexport.cxx
46 +++ b/oox/source/export/vmlexport.cxx
47 @@ -662,7 +662,8 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
48 break;
49
50 case ESCHER_Prop_fHidden:
51 - m_pShapeStyle->append( ";visibility:hidden" );
52 + if ( !it->nPropValue )
53 + m_pShapeStyle->append( ";visibility:hidden" );
54 break;
55 default:
56 #if OSL_DEBUG_LEVEL > 0
57 diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
58 index 55dd28b..067cafe 100644
59 --- a/oox/source/xls/commentsbuffer.cxx
60 +++ b/oox/source/xls/commentsbuffer.cxx
61 @@ -268,8 +268,7 @@ void Comment::finalizeImport()
62 // position and formatting
63 pNoteShape->convertFormatting( xAnnoShape );
64 // visibility
65 - const ::oox::vml::ClientData* pClientData = pNoteShape->getClientData();
66 - xAnno->setIsVisible( pClientData && pClientData->mbVisible );
67 + bVisible = pNoteShape->getTypeModel().mbVisible;
68 }
69 }
70 break;
71 diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
72 index 56f30fe..106d63e 100644
73 --- a/sc/source/filter/xcl97/xcl97rec.cxx
74 +++ b/sc/source/filter/xcl97/xcl97rec.cxx
75 @@ -566,7 +566,7 @@ VmlCommentExporter::VmlCommentExporter( sax_fastparser::FSHelperPtr p, ScAddress
76 void VmlCommentExporter::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect )
77 {
78 lcl_FillProps( rProps, mpCaption, mbVisible );
79 - rProps.AddOpt( ESCHER_Prop_fHidden, 1 ); // bool field
80 + rProps.AddOpt( ESCHER_Prop_fHidden, mbVisible ); // bool field
81
82 VMLExport::Commit( rProps, rRect );
83 }
84
85 --------------erAck-patch-parts--
86
87
  ViewVC Help
Powered by ViewVC 1.1.30