diff options
author | Martin Gallwey <mtg@openoffice.org> | 2001-08-14 12:55:40 +0000 |
---|---|---|
committer | Martin Gallwey <mtg@openoffice.org> | 2001-08-14 12:55:40 +0000 |
commit | eeea354d5bd5edf226f073ef43a1ed9348704acc (patch) | |
tree | 57d88b50d4bf3ee2b98f5288b767d8c997c1520b | |
parent | 661572dc2411f705117a7d1bc442cf121229ce99 (diff) |
#90608# Do not call PrtDataChanged when setting the printer on xml import or else all of the OLE objects will be loaded
-rw-r--r-- | sw/source/core/doc/docdesc.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index cfbee8d3ee..81fff0c883 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docdesc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2001-02-23 12:45:12 $ + * last change: $Author: mtg $ $Date: 2001-08-14 13:55:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -894,17 +894,18 @@ void SwDoc::PrtOLENotify( BOOL bAll ) } } -void SwDoc::SetPrt( SfxPrinter *pP ) +void SwDoc::SetPrt( SfxPrinter *pP, sal_Bool bCallPrtDataChanged ) { ASSERT( pP, "Kein Drucker !" ); const BOOL bInitPageDesc = pPrt == 0; - if ((ULONG) pP != (ULONG) pPrt) + if ( (ULONG) pP != (ULONG) pPrt) { delete pPrt; pPrt = pP; - PrtDataChanged(); + if ( bCallPrtDataChanged ) + PrtDataChanged(); } if( bInitPageDesc ) |