[ooo-build-commit] .: patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Wed Aug 18 09:54:05 PDT 2010
patches/dev300/xlsx-shared-xlsx-snapshot.diff | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 74f2517c386946191e77e5460dfd12eb5cb914d5
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Wed Aug 18 18:50:37 2010 +0200
Pass correct tab ID to XclExpObjList
(this prevents random crashes on pic/chart export and this
is hopefully the correct fix - tab ID must be known to ObjList
to pass it correctly to added objects later)
* patches/dev300/xlsx-shared-xlsx-snapshot.diff:
diff --git a/patches/dev300/xlsx-shared-xlsx-snapshot.diff b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
index 019ddd1..ed11f56 100644
--- a/patches/dev300/xlsx-shared-xlsx-snapshot.diff
+++ b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
@@ -2002,7 +2002,7 @@
using ::rtl::OString;
using ::rtl::OUString;
-@@ -86,9 +91,19 @@
+@@ -86,13 +91,24 @@
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::drawing::XShape;
@@ -2022,14 +2022,19 @@
XclExpObjList::XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx ) :
XclExpRoot( rRoot ),
mrEscherEx( rEscherEx ),
+ pSolverContainer( 0 ),
++ mnScTab( rRoot.GetCurrScTab() )
+ {
+ pMsodrawingPerSheet = new XclExpMsoDrawing( rEscherEx );
+ // open the DGCONTAINER and the patriarch group shape
@@ -118,6 +133,7 @@
- Insert( pObj, LIST_APPEND );
- UINT16 nCnt = (UINT16) Count();
- pObj->SetId( nCnt );
-+ pObj->SetTab( mnScTab );
- return nCnt;
- }
- else
+ Insert( pObj, LIST_APPEND );
+ UINT16 nCnt = (UINT16) Count();
+ pObj->SetId( nCnt );
++ pObj->SetTab( mnScTab );
+ return nCnt;
+ }
+ else
@@ -149,6 +165,128 @@
pSolverContainer->Save( rStrm );
}
More information about the ooo-build-commit
mailing list