diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-12-21 16:45:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-12-21 16:45:35 +0100 |
| commit | 16011587ae9487b7cd6a45f4ae6fdf364ef0b185 (patch) | |
| tree | 96e67f37caec05e4c9c85237f7d9f9b1fdab0f8a /sw/source/ui/app/apphdl.cxx | |
| parent | ae6136a94397b4fcbdb278a35a3b30c87b070fb2 (diff) | |
sw34bf03: #i116192#: SwDoc::SetFixFields must not be called by timer:
call it when receiving SFX_EVENT_DOCCREATED, which is synchronously
dispatched much earlier, before API clients can access the document.
Diffstat (limited to 'sw/source/ui/app/apphdl.cxx')
| -rw-r--r-- | sw/source/ui/app/apphdl.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 653208aaf250..ed4d630de6c1 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -701,14 +701,10 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) SwWrtShell* pWrtSh = pDocSh ? pDocSh->GetWrtShell() : 0; switch( rEvHint.GetEventId() ) { -/* MA 07. Mar. 96: UpdateInputFlds() nur noch bei Dokument neu. - (Und bei Einfuegen Textbaust.) - case SFX_EVENT_OPENDOC: - // dann am aktuellen Dokument die Input-Fedler updaten - if( pWrtSh ) - pWrtSh->UpdateInputFlds(); + case SFX_EVENT_DOCCREATED: + OSL_ASSERT(!pWrtSh); + pDocSh->GetDoc()->SetFixFields(false, 0); break; -*/ case SFX_EVENT_CREATEDOC: // alle FIX-Date/Time Felder auf akt. setzen if( pWrtSh ) @@ -717,7 +713,6 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) sal_Bool bUpdateFields = sal_True; if( pUpdateDocItem && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE) bUpdateFields = sal_False; - pWrtSh->SetFixFields(); if(bUpdateFields) { pWrtSh->UpdateInputFlds(); |