From f8a260011bad0f68052f5ce68bd62fa668b29599 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 15 Oct 2009 11:39:37 +0000 Subject: CWS-TOOLING: integrate CWS fwk122 2009-10-06 09:16:04 +0200 mav r276693 : #i10000# let be compiled on all platforms 2009-10-05 17:02:17 +0200 cd r276688 : #i105343# Fix build problems under Linux/Mac 2009-10-05 16:23:29 +0200 cd r276687 : #i105489# Remove uiconfigurationmanagerimpl.obj from makefile.mk 2009-10-05 15:17:05 +0200 cd r276680 : #i105326# Fix crash when opening file with notes 2009-10-05 11:02:22 +0200 mav r276665 : #i105343# allow the view shell to disconnect from listener 2009-10-02 11:33:45 +0200 cd r276619 : #i105489# Revert changes done to aggregate sources due to too much regressions --- sw/source/ui/docvw/PostItMgr.cxx | 8 -------- 1 file changed, 8 deletions(-) (limited to 'sw/source/ui/docvw') diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 75b24153573e..6bea77137ac6 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() -- cgit From 68078d21c2b2321357eb355097ec78d665d37956 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 1 Dec 2009 08:03:58 +0000 Subject: CWS-TOOLING: integrate CWS hb32showstoppers2 2009-11-05 14:28:58 +0100 hbrinkm r277370 : CWS-TOOLING: rebase CWS hb32showstoppers2 to branches/OOO320@277262 (milestone: OOO320:m3) 2009-11-04 16:04:47 +0100 hbrinkm r277357 : #i102434# write background color/shadow like WW8 does 2009-11-03 12:22:27 +0100 os r277319 : #i106515# call to LeaveDrawCreate() moved from SwWrtShell::UnSelectFrame() to SwPostItMgr::AssureStdModeAtShell() 2009-10-30 14:58:39 +0100 hbrinkm r277272 : #i103374# set default style on table row ends 2009-10-30 13:19:38 +0100 hbrinkm r277265 : #i106057# applied here because otherwise saving DOCs crashes 2009-10-28 13:50:44 +0100 hbrinkm r277240 : applied patch for OOO320_m2 #i105052# debugging code #i102420# rewritten debug output for SwNodes. #i105052# debugging code sw/source/filter/ww8/wrtww8.cxx: MSWordExportBase::WriteText: Keep track of nodes already exported and assert when a node is exported for the second time. sw/source/filter/ww8/WW8TableInfo.cxx: WW8TableNodeInfo::setNext: Announce from where to where the next pointer points. #i105052# save pointer to next SwNode in WW8TableNodeInfo merged DEV300_m60 #i105653# applied patch #i105941# crash on initialization fixed merged changes from hb32showstoppers 2009-10-27 16:39:40 +0100 mst r277223 : #i106349#: SwBaseShell::ExecUndo(): do not access members after dying --- sw/source/ui/docvw/PostItMgr.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'sw/source/ui/docvw') diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 6bea77137ac6..3c32ef04e9e1 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -1941,6 +1941,7 @@ void SwPostItMgr::AssureStdModeAtShell() { mpWrtShell->UnSelectFrm(); mpWrtShell->LeaveSelFrmMode(); + mpWrtShell->GetView().LeaveDrawCreate(); mpWrtShell->EnterStdMode(); mpWrtShell->DrawSelChanged(); -- cgit