diff options
author | Laurent Godard <lgodard.libre@laposte.net> | 2015-08-18 16:44:55 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-31 10:21:41 +0000 |
commit | cd91509191bee9faaabdae185fef58b811f3a5a4 (patch) | |
tree | b29d3d60445f9fb247cbe3fd2503de2cc54db4ae /include | |
parent | d3f5b205e4600bfa2ca062f404bb8e58b657c621 (diff) |
tdf#75973 : User Defined Types in password encrypted macros
save/load basic script so that when executing password protected
the user defined types can be rebuilt
supports array and nested types
New identifier B_USERTYPE for save/open macro with user defined types
No version bump but saves binary format now to current_version
a unit test in sc macros-test.cxx
full round trip on password protected document (ie. use binary storage)
master --(0)--> master --(1)--> libreoffice 4.4 --(2)--> master --(3)--> master
(0) in master, User type supported, big module supported
(1) in libreoffice 4.4, user type not supported, big module supported, no loss of code
(2) in master, user type not supported, big module not found, no loss of code
it is OK as libreoffice 4.4 saves to LegacyVersion (see sbxmod.cxx changes)
(3) in master, User type supported, big module supported (all is restored)
it is OK as module was saved with CURRENT_VERSION (see sbxmod.cxx changes)
Change-Id: Idab5de85e948dc11f4aba631b1569a1cc1cb4bf6
Reviewed-on: https://gerrit.libreoffice.org/17841
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/basic/sbmod.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index c5a9e16480fb..cddfffb86b4b 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -119,7 +119,6 @@ public: void ClearAllBP(); // Store only image, no source (needed for new password protection) - bool StoreBinaryData( SvStream& ); bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); bool LoadBinaryData( SvStream&, sal_uInt16 nVer ); bool LoadBinaryData( SvStream& ); |