diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-08 08:36:06 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-08 08:36:06 +0200 |
| commit | 01693a8a10be052a15a7e4ebe3084cb23dae3c07 (patch) | |
| tree | 1044b5ab6c04ff2b9ddf04a3716741b012d45221 /sw/source/ui/uiview/viewmdi.cxx | |
| parent | cb16c0615a79235f74d3675549f39a1851157a06 (diff) | |
| parent | a970622b31d98cf06b1fc7221e6c8a67e8716b66 (diff) | |
Automated merge with http://x42-so4:8009/ooo
Diffstat (limited to 'sw/source/ui/uiview/viewmdi.cxx')
| -rw-r--r-- | sw/source/ui/uiview/viewmdi.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index d3c5d54d8743..9dfa8e79ecfa 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -82,7 +82,6 @@ #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> -#include <postit.hxx> USHORT SwView::nMoveType = NID_PGE; sal_Int32 SwView::nActMark = 0; @@ -241,12 +240,12 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, if( bUnLockView ) pWrtShell->LockView( FALSE ); - if ( mpPostItMgr ) - { - mpPostItMgr->Rescale(); - mpPostItMgr->CalcRects(); - mpPostItMgr->LayoutPostIts(); - } +// if ( mpPostItMgr ) +// { +// mpPostItMgr->Rescale(); +// mpPostItMgr->CalcRects(); +// mpPostItMgr->LayoutPostIts(); +// } // eZoom = eZoomType; } @@ -489,15 +488,15 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) break; case NID_POSTIT: { - SwMarginWin* pPostIt = pThis->GetPostItMgr()->GetActivePostIt(); + sw::sidebarwindows::SwSidebarWin* pPostIt = pThis->GetPostItMgr()->GetActiveSidebarWin(); if (pPostIt) - pThis->GetPostItMgr()->SetActivePostIt(0); + pThis->GetPostItMgr()->SetActiveSidebarWin(0); SwFieldType* pFldType = rSh.GetFldType(0, RES_POSTITFLD); if (rSh.MoveFldType(pFldType, bNext)) pThis->GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT); else //first/last item - pThis->GetPostItMgr()->SetActivePostIt(pPostIt); + pThis->GetPostItMgr()->SetActiveSidebarWin(pPostIt); } break; case NID_SRCH_REP: |