diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
| commit | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (patch) | |
| tree | 373386268af66194acb407856bb65f541579a25b /sw/source/core/draw | |
| parent | af69eeaeae90037f27e7a8a10fce1b4899d5b305 (diff) | |
CWS swlayoutrefactoring: conflict resolution after resync to DEV300_m96
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dview.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index e2ac04bf7e85..207e3f0d4f68 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -1110,18 +1110,3 @@ void SwDrawView::DeleteMarked() pTmpRoot->EndAllAction(); //swmod 080218 } -<<<<<<< local -======= -/******** -JP 02.10.98: sollte als Fix fuer 57153 gelten, hatte aber Nebenwirkungen, - wie Bug 57475 -const SdrMarkList& SwDrawView::GetMarkedObjectList() const -{ - FlushComeBackTimer(); - return FmFormView::GetMarkedObjectList(); -} -*************/ - - - ->>>>>>> other |