[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

[Herbert Dürr]

 sc/source/filter/lotus/lotimpop.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit db318652c8ac1ea3f4e7c4a2f838a34e4b2ec756
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Aug 1 13:14:40 2013 +0000

    #i122841# initialize LotusRoot singleton already in LotusRoot constructor
    
    As its LotAttrCache member already needs it which results in crashes if
    any Lotus 123 files were loaded.

diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index f6df37d..9dd8692 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -55,9 +55,10 @@ LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, CharSet eQ )
         eFirstType( Lotus_X),
         eActType( Lotus_X),
         pRngNmBffWK3( new RangeNameBufferWK3),
-        pFontBuff( new LotusFontBuffer),
-        pAttrTable( new LotAttrTable)
+        pFontBuff( new LotusFontBuffer)
 {
+    pLotusRoot = this; // #122841# the singleton global var is already needed for LotAttrTable
+    pAttrTable = new LotAttrTable;
 }