diff options
| author | Laurent Godard <lgodard.libre@laposte.net> | 2015-08-19 17:58:12 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-31 10:14:12 +0000 |
| commit | 8a7b7b7b72c299bc9a96815814c1452be7f662c1 (patch) | |
| tree | 21e8788438b97cfebf75e87dea3fb6c88ec5db15 /basic/source/uno | |
| parent | 9093585317de876c2f04a01b5c3ea137114341c0 (diff) | |
New identifier for save/open macro with user defined types
no version bump but B_USERTYPE defined
fix test from commit de26ef85 that should be nMaxRecords
tested 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
(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)
Change-Id: I237cf7de70adf1a755be1bc30987b21c43b6ab35
Reviewed-on: https://gerrit.libreoffice.org/17871
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basic/source/uno')
| -rw-r--r-- | basic/source/uno/scriptcont.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index c7df851a09e3..91ecc7057b3b 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -18,6 +18,7 @@ */ #include "scriptcont.hxx" +#include <filefmt.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> @@ -623,7 +624,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons throw uno::RuntimeException(); } SvMemoryStream aMemStream; - /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream ); + /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION ); sal_Size nSize = aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); @@ -766,7 +767,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ); SvMemoryStream aMemStream; - /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream ); + /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION ); sal_Size nSize = aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); |