diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-09 22:07:29 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-09 22:07:29 +0100 |
| commit | 40bf1f9d72b48c7060f388bbfdba5bc6ff5966a3 (patch) | |
| tree | fbf83c416f4793755f7e1a8f138e0a1020396dd5 /sw/source/ui/docvw | |
| parent | 0eb60a412f3ba46dd33915a3aaadd01d31717b8b (diff) | |
| parent | b4c4d7ac0a50b17c526fc8092d1fa3b7b39dadd5 (diff) | |
dba33b: merge CWS head with head resulting from pulling DEV300_m67
Diffstat (limited to 'sw/source/ui/docvw')
| -rw-r--r-- | sw/source/ui/docvw/PostItMgr.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 75b24153573e..3c32ef04e9e1 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -154,14 +154,6 @@ SwPostItMgr::SwPostItMgr(SwView* pView) mbWaitingForCalcRects = true; mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 ); } - - //#i# - if (HasNotes() && !mpWrtShell->GetViewOptions()->IsPostIts()) - { - SfxRequest aRequest(mpView->GetViewFrame(),FN_VIEW_NOTES); - mpView->ExecViewOptions(aRequest); - } - } SwPostItMgr::~SwPostItMgr() @@ -1949,6 +1941,7 @@ void SwPostItMgr::AssureStdModeAtShell() { mpWrtShell->UnSelectFrm(); mpWrtShell->LeaveSelFrmMode(); + mpWrtShell->GetView().LeaveDrawCreate(); mpWrtShell->EnterStdMode(); mpWrtShell->DrawSelChanged(); |