[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 3 commits - sw/source

[Jan Holesovsky]

 sw/source/core/doc/doc.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 25a97e7c5cd07558f46132b0f9083e51b2976812
Merge: 2a03a2e... ea2f3cd...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 11 18:25:41 2010 +0100

    Merge commit 'ooo/OOO330_m14' into libreoffice-3-3

commit ea2f3cd49d7aa095e597cf5ec966dd33b77c2813
Merge: 31f654d... 3ce1e3d...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Sat Nov 6 16:46:04 2010 +0100

    CWS-TOOLING: integrate CWS tl88

commit 3ce1e3d5c494d5f467d43bdfe52be7b8c91eb684
Author: Thomas Lange [tl] <tl at openoffice.org>
Date:   Wed Nov 3 14:59:06 2010 +0100

    cws tl88: #i115354# crash when opening File/Print dialog fixed

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a470440..4cd3601 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -631,6 +631,8 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
 
 SwPrintData* SwDoc::getPrintData() const
 {
+    if(!pPrtData)
+        ((SwDoc*)this)->pPrtData = new SwPrintData;
     return pPrtData;
 }