diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 16:33:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:04 +0200 |
| commit | dc47b2e5136f0f767273dc5fdba5c822575e194b (patch) | |
| tree | 128ac4f7f3aca38d0928b76e529ae7fae021f7c3 /oox | |
| parent | e14b7660f622a83fe97635649674ade05fe1eb72 (diff) | |
Unwind SotStorageRef typedef
Change-Id: I8d5363bb2ad813ef29b4078848914f4b0989b9f1
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/ooxml-export-notes.txt | 2 | ||||
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/export/ooxml-export-notes.txt b/oox/source/export/ooxml-export-notes.txt index 9855c1dc4c96..6129e51b0baf 100644 --- a/oox/source/export/ooxml-export-notes.txt +++ b/oox/source/export/ooxml-export-notes.txt @@ -150,7 +150,7 @@ Old binary filters (export) - So why's CheckPackageSignature_Impl() fail? Because lcl_ExportExcel2007Xml() had the code: - SotStorageRef xRootStrg = new SotStorage( pMedStrm, FALSE ); + tools::SvRef<SotStorage> xRootStrg = new SotStorage( pMedStrm, FALSE ); That is, it was creating an OLE Structured Storage document over the SvStream, and then (later) used the *same* SvStream and passed it to diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index dc5bda3dd4e5..08b126d24f17 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -522,7 +522,7 @@ bool MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rI return rxFormComp.is(); } -bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg, +bool MSConvertOCXControls::ReadOCXStorage( tools::SvRef<SotStorage>& xOleStg, Reference< XFormComponent > & rxFormComp ) { if ( xOleStg.Is() ) @@ -570,7 +570,7 @@ bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star::un return true; } -bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, SotStorageRef &xOleStg, +bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, tools::SvRef<SotStorage> &xOleStg, const Reference< XControlModel > &rxControlModel, const com::sun::star::awt::Size& rSize, OUString &rName) { |