diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-08-25 00:14:02 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-10 04:14:48 +0200 |
| commit | 3d492e8f5d5062dd4f52f29e36047ea82f18bce4 (patch) | |
| tree | 6a7faacc1abcc70deecd0fdd4e81bca84699d3a0 /oox | |
| parent | 8e06037b3f9d13a29a6ffd2f030e4360c7e1a30a (diff) | |
handle different callers for vba export code
This now integrates it correctly with the XLS code, the XLSX one
requires a bit more work to copy the stream to the OOXML file.
Change-Id: Ic853ce795fc2ac2941083a76fd0a8cad7c6add09
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/vbaexport.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index d20de95c8b02..c52c1b6243e1 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -611,15 +611,10 @@ void exportDirStream(SvStream& rStrm) } -void VbaExport::exportVBA() +void VbaExport::exportVBA(SotStorage* pRootStorage) { // start here with the VBA export - - const OUString aVbaStreamLocation("/tmp/vba_out.bin"); - SvFileStream aVbaStream(aVbaStreamLocation, STREAM_READWRITE); - - tools::SvRef<SotStorage> aStorage(new SotStorage(aVbaStream)); - SotStorage* pVBAStream = aStorage->OpenSotStorage("VBA", STREAM_READWRITE); + SotStorage* pVBAStream = pRootStorage->OpenSotStorage("VBA", STREAM_READWRITE); SotStorageStream* pDirStream = pVBAStream->OpenSotStream("dir", STREAM_READWRITE); // export @@ -638,7 +633,7 @@ void VbaExport::exportVBA() } pDirStream->Commit(); pVBAStream->Commit(); - aStorage->Commit(); + pRootStorage->Commit(); } css::uno::Reference<css::script::XLibraryContainer> VbaExport::getLibraryContainer() |