diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-01-25 18:35:57 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-01-25 18:35:57 +0100 |
| commit | abd28b0352a654d43aeeb6a034370cf265fa93cc (patch) | |
| tree | 1db9c09b252ef2c37463162fc2793bc746d500ba /sw/source/filter/basflt/shellio.cxx | |
| parent | 5d2f51945b10f6c3cad3286e5cce101a1d1c1727 (diff) | |
| parent | 1379283b49bd1acf89269ee569a2eb3aafd25376 (diff) | |
CWS gnumake3: resync to m98
Diffstat (limited to 'sw/source/filter/basflt/shellio.cxx')
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 963c5c847500..b0b69501979e 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -530,7 +530,7 @@ SwDoc* Reader::GetTemplateDoc() { SwDocShell *pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL ); - SfxObjectShellRef xDocSh = pDocSh; + SfxObjectShellLock xDocSh = pDocSh; if( pDocSh->DoInitNew( 0 ) ) { pTemplate = pDocSh->GetDoc(); @@ -805,15 +805,12 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) SwPaM * pPam; SwDoc *pDoc = 0; - SfxObjectShellRef* pRefForDocSh = 0; if ( pShell && !bWriteAll && pShell->IsTableMode() ) { bWriteAll = TRUE; pDoc = new SwDoc; pDoc->acquire(); - pRefForDocSh = new SfxObjectShellRef(); - pDoc->SetRefForDocShell( pRefForDocSh ); // kopiere Teile aus einer Tabelle: lege eine Tabelle mit der Breite // von der Originalen an und kopiere die selectierten Boxen. @@ -971,7 +968,6 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) if ( pDoc ) { - delete pRefForDocSh; if ( !pDoc->release() ) delete pDoc; bWriteAll = FALSE; |