sw33a11y01: #i88070# refactoring of sidebar window code used for visualization of comments/annotations

1 files changed, 231 insertions, 181 deletions

diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 3c32ef04e9e1..0619fb163ec4 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -35,6 +35,13 @@
 #include "PostItMgr.hxx"
 #include <postithelper.hxx>
 
+#include <SidebarWin.hxx>
+#include <AnnotationWin.hxx>
+
+#include <SidebarWindowsConsts.hxx>
+#include <AnchorOverlayObject.hxx>
+#include <ShadowOverlayObject.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/outdev.hxx>
@@ -49,7 +56,6 @@
 #include <fmtfld.hxx>
 #include <docufld.hxx>
 #include <edtwin.hxx>
-#include <postit.hxx>
 #include <txtfld.hxx>
 #include <ndtxt.hxx>
 #include <redline.hxx>
@@ -59,7 +65,7 @@
 #include <tools/color.hxx>
 
 #include <swmodule.hxx>
-#include <docvw.hrc>
+#include <annotation.hrc>
 #include "cmdid.h"
 
 #include <SwRewriter.hxx>
@@ -94,6 +100,8 @@
 // if we layout more often we stop, this should never happen
 #define MAX_LOOP_COUNT                      50
 
+using namespace sw::sidebarwindows;
+
 /*
 bool comp_author( const SwPostItItem* a, const SwPostItItem* b)
 {
@@ -108,7 +116,7 @@ bool comp_date( const SwPostItItem* a, const SwPostItItem* b)
 
 // if position is on the same line, sort by x (Left) position, otherwise by y(Bottom) position
 // if two notes are at the same position, sort by logical node position
-bool comp_pos(const SwMarginItem *a, const SwMarginItem *b)
+bool comp_pos(const SwSidebarItem *a, const SwSidebarItem *b)
 {
     return (a->mPos.Bottom() == b->mPos.Bottom()) ?
             ( ((a->mPos.Left() == b->mPos.Left()) && (a->GetBroadCaster()->ISA(SwFmtFld) && b->GetBroadCaster()->ISA(SwFmtFld)) ) ?
@@ -144,7 +152,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView)
     // collect all PostIts and redline comments that exist after loading the document
     // don't check for existance for any of them, don't focus them
     AddPostIts(false,false);
-    /*  this code can be used once we want redline comments in the margin
+    /*  this code can be used once we want redline comments in the Sidebar
     AddRedlineComments(false,false);
     */
     // we want to receive stuff like SFX_HINT_DOCCHANGED
@@ -160,8 +168,8 @@ SwPostItMgr::~SwPostItMgr()
 {
     if ( mnEventId )
         Application::RemoveUserEvent( mnEventId );
-    // forget about all our margin windows
-    RemoveMarginWin();
+    // forget about all our Sidebar windows
+    RemoveSidebarWin();
     EndListening( *mpView->GetDocShell() );
 
     for(std::vector<SwPostItPageItem*>::iterator i = mPages.begin(); i!= mPages.end() ; i++)
@@ -172,15 +180,15 @@ SwPostItMgr::~SwPostItMgr()
 void SwPostItMgr::CheckForRemovedPostIts()
 {
     bool bRemoved = false;
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end(); )
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end(); )
     {
-        std::list<SwMarginItem*>::iterator it = i++;
+        std::list<SwSidebarItem*>::iterator it = i++;
         if ( !(*it)->UseElement() )
         {
-            SwMarginItem* p = (*it);
+            SwSidebarItem* p = (*it);
             mvPostItFlds.remove(*it);
-            if (GetActivePostIt() == p->pPostIt)
-                 SetActivePostIt(0);
+            if (GetActiveSidebarWin() == p->pPostIt)
+                SetActiveSidebarWin(0);
             if (p->pPostIt)
                 delete p->pPostIt;
             delete p;
@@ -208,7 +216,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
 {
     if (bCheckExistance)
     {
-        for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         {
             if ( (*i)->GetBroadCaster() == pItem )
                 return;
@@ -216,7 +224,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
     }
     mbLayout = bFocus;
     if (pItem->ISA(SwFmtFld))
-        mvPostItFlds.push_back(new SwPostItItem(static_cast<SwFmtFld*>(pItem), true, bFocus) );
+        mvPostItFlds.push_back(new SwAnnotationItem(static_cast<SwFmtFld*>(pItem), true, bFocus) );
     /*
     else
     if (pItem->ISA(SwRedline))
@@ -229,13 +237,13 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
 void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
 {
     EndListening(*pBroadcast);
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         if ( (*i)->GetBroadCaster() == pBroadcast )
         {
-            SwMarginItem* p = (*i);
-            if (GetActivePostIt() == p->pPostIt)
-                SetActivePostIt(0);
+            SwSidebarItem* p = (*i);
+            if (GetActiveSidebarWin() == p->pPostIt)
+                SetActiveSidebarWin(0);
             mvPostItFlds.remove(*i);
             delete p->pPostIt;
             delete p;
@@ -383,7 +391,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             case SWFMTFLD_CHANGED:
             {
                         SwFmtFld* pFmtFld = dynamic_cast<SwFmtFld*>(&rBC);
-                for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+                for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
                 {
                             if ( pFmtFld == (*i)->GetBroadCaster() )
                     {
@@ -400,7 +408,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             case SWFMTFLD_LANGUAGE:
             {
                         SwFmtFld* pFmtFld = dynamic_cast<SwFmtFld*>(&rBC);
-                for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+                for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
                 {
                                 if ( pFmtFld == (*i)->GetBroadCaster() )
                     {
@@ -414,7 +422,8 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                                 case SCRIPTTYPE_ASIAN :    nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
                                 case SCRIPTTYPE_COMPLEX :  nLangWhichId = EE_CHAR_LANGUAGE_CTL; break;
                             }
-                            (*i)->pPostIt->SetLanguage(SvxLanguageItem((*i)->GetFmtFld()->GetFld()->GetLanguage(),nLangWhichId));
+                            (*i)->pPostIt->SetLanguage( SvxLanguageItem((*i)->GetFmtFld()->GetFld()->GetLanguage(),
+                                                        nLangWhichId) );
                         }
                         break;
                     }
@@ -433,7 +442,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC)
         mpView->ExecViewOptions(aRequest);
     }
 
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         // field to get the focus is the broadcaster
         if ( &rBC == (*i)->GetBroadCaster() )
@@ -467,9 +476,9 @@ bool SwPostItMgr::CalcRects()
     PreparePageContainer();
     if ( !mvPostItFlds.empty() )
     {
-        for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         {
-            SwMarginItem* pItem = (*i);
+            SwSidebarItem* pItem = (*i);
             if ( !pItem->UseElement() )
             {
                 DBG_ERROR("PostIt is not in doc or other wrong use");
@@ -489,7 +498,7 @@ bool SwPostItMgr::CalcRects()
                     pItem->mPos = rInfo.mPosition;
                     pItem->mPagePos = rInfo.mPageFrame;
                     pItem->mFramePos = rInfo.mPagePrtArea;
-                    pItem->bMarginSide = rInfo.mbMarginSide;
+                    pItem->meSidebarPosition = rInfo.meSidebarPosition;
                     pItem->mnPageNumber = rInfo.mnPageNumber;
                     pItem->mRedlineAuthor = rInfo.mRedlineAuthor;
             }
@@ -501,9 +510,9 @@ bool SwPostItMgr::CalcRects()
         Sort(SORT_POS);
 
         // sort the items into the right page vector, so layout can be done by page
-        for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         {
-            SwMarginItem* pItem = (*i);
+            SwSidebarItem* pItem = (*i);
             if( SwPostItHelper::INVISIBLE == pItem->mLayoutStatus )
             {
                 if (pItem->pPostIt)
@@ -530,7 +539,7 @@ bool SwPostItMgr::CalcRects()
             }
             mPages[aPageNum-1]->mList->push_back(pItem);
             mPages[aPageNum-1]->mPageRect = pItem->mPagePos;
-            mPages[aPageNum-1]->bMarginSide = pItem->bMarginSide;
+            mPages[aPageNum-1]->eSidebarPosition = pItem->meSidebarPosition;
         }
 
         if (!bChange && mpWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE))
@@ -559,9 +568,9 @@ bool SwPostItMgr::CalcRects()
 
 bool SwPostItMgr::HasScrollbars() const
 {
-    for(std::list<SwMarginItem*>::const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
-        if ((*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Scrollbar())
+        if ((*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->HasScrollbar())
             return true;
     }
     return false;
@@ -613,24 +622,24 @@ void SwPostItMgr::LayoutPostIts()
                 // only layout if there are notes on this page
                 if (mPages[n]->mList->size()>0)
                 {
-                    std::list<SwMarginWin*> aVisiblePostItList;
+                    std::list<SwSidebarWin*>    aVisiblePostItList;
                     unsigned long           lNeededHeight = 0;
                     long                    mlPageBorder = 0;
                     long                    mlPageEnd = 0;
 
-                    for(SwMarginItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
+                    for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
                     {
-                        SwMarginItem* pItem = (*i);
-                        SwMarginWin* pPostIt = pItem->pPostIt;
+                        SwSidebarItem* pItem = (*i);
+                        SwSidebarWin* pPostIt = pItem->pPostIt;
 
-                        if (mPages[n]->bMarginSide)
+                        if (mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT )
                         {
                             // x value for notes positioning
                             mlPageBorder = mpEditWin->LogicToPixel( Point( mPages[n]->mPageRect.Left(), 0)).X() - GetSidebarWidth(true);// - GetSidebarBorderWidth(true);
                             //bending point
                             mlPageEnd = mpWrtShell->getIDocumentSettingAccess()->get( IDocumentSettingAccess::BROWSE_MODE) ? pItem->mFramePos.Left() : mPages[n]->mPageRect.Left() + 350;
                         }
-                        else
+                        else if (mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_RIGHT )
                         {
                             // x value for notes positioning
                             mlPageBorder = mpEditWin->LogicToPixel( Point(mPages[n]->mPageRect.Right(), 0)).X() + GetSidebarBorderWidth(true);
@@ -644,32 +653,40 @@ void SwPostItMgr::LayoutPostIts()
                             long aPostItHeight = 0;
                             if (!pPostIt)
                             {
-                                pPostIt = (*i)->GetMarginWindow(static_cast<Window*>(&mpView->GetEditWin()),WINDOW_CONTROL|WB_NODIALOGCONTROL,this,0);
+                                pPostIt = (*i)->GetSidebarWindow( mpView->GetEditWin(),
+                                                                  WINDOW_CONTROL|WB_NODIALOGCONTROL,
+                                                                  *this,
+                                                                  0 );
                                 pPostIt->InitControls();
                                 pPostIt->SetReadonly(mbReadOnly);
                                 pItem->pPostIt = pPostIt;
                                 if (mpAnswer)
                                 {
                                     if (pPostIt->CalcFollow()) //do we really have another note in front of this one
-                                        static_cast<SwPostIt*>(pPostIt)->InitAnswer(mpAnswer);
+                                        static_cast<sw::annotation::SwAnnotationWin*>(pPostIt)->InitAnswer(mpAnswer);
                                     delete mpAnswer;
                                     mpAnswer = 0;
                                 }
                             }
 
-                                            if (pItem->pPostIt->ISA(SwPostIt))
-                            {
-                                static_cast<SwPostIt*>(pPostIt)->SetChangeTracking(pItem->mLayoutStatus,GetColorAnkor(pItem->mRedlineAuthor));
-                            }
-                            pPostIt->SetMarginSide(mPages[n]->bMarginSide);
+                            pPostIt->SetChangeTracking(pItem->mLayoutStatus,GetColorAnkor(pItem->mRedlineAuthor));
+                            pPostIt->SetSidebarPosition(mPages[n]->eSidebarPosition);
                             pPostIt->SetFollow(pPostIt->CalcFollow());
-                            aPostItHeight = ( pPostIt->GetPostItTextHeight() < pPostIt->GetMinimumSizeWithoutMeta() ? pPostIt->GetMinimumSizeWithoutMeta() : pPostIt->GetPostItTextHeight() ) + pPostIt->GetMetaHeight();
-                            pPostIt->SetPosSizePixelRect( mlPageBorder ,Y-GetInitialAnchorDistance(), GetNoteWidth() ,aPostItHeight,pItem->mPos, mlPageEnd);
+                            aPostItHeight = ( pPostIt->GetPostItTextHeight() < pPostIt->GetMinimumSizeWithoutMeta()
+                                              ? pPostIt->GetMinimumSizeWithoutMeta()
+                                              : pPostIt->GetPostItTextHeight() )
+                                            + pPostIt->GetMetaHeight();
+                            pPostIt->SetPosSizePixelRect( mlPageBorder ,
+                                                          Y - GetInitialAnchorDistance(),
+                                                          GetNoteWidth() ,
+                                                          aPostItHeight,
+                                                          pItem->mPos,
+                                                          mlPageEnd );
 
                             if (pItem->bFocus)
                             {
                                 mbLayout = true;
-                                                pPostIt->GrabFocus();
+                                pPostIt->GrabFocus();
                                 pItem->bFocus = false;
                             }
                             // only the visible postits are used for the final layout
@@ -709,7 +726,7 @@ void SwPostItMgr::LayoutPostIts()
                                            - enlarge all notes till GetNextBorder(), as we resized to average value before
                                            */
                         //lets hide the ones which overlap the page
-                        for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+                        for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
                         {
                             if (mPages[n]->lOffset != 0)
                                 (*i)->TranslateTopPosition(mPages[n]->lOffset);
@@ -724,24 +741,28 @@ void SwPostItMgr::LayoutPostIts()
                             {
                                 if (mpEditWin->PixelToLogic(Point(0,(*i)->VirtualPos().Y())).Y() < (mPages[n]->mPageRect.Top()+aSidebarheight))
                                 {
-                                    if (mPages[n]->bMarginSide)
-                                        (*i)->ShowAnkorOnly(Point(mPages[n]->mPageRect.Left(),mPages[n]->mPageRect.Top()));
-                                    else
-                                        (*i)->ShowAnkorOnly(Point(mPages[n]->mPageRect.Right(),mPages[n]->mPageRect.Top()));
+                                    if ( mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT )
+                                        (*i)->ShowAnchorOnly(Point( mPages[n]->mPageRect.Left(),
+                                                                    mPages[n]->mPageRect.Top()));
+                                    else if ( mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_RIGHT )
+                                        (*i)->ShowAnchorOnly(Point( mPages[n]->mPageRect.Right(),
+                                                                    mPages[n]->mPageRect.Top()));
                                 }
                                 else
                                 {
-                                    if (mPages[n]->bMarginSide)
-                                        (*i)->ShowAnkorOnly(Point(mPages[n]->mPageRect.Left(),mPages[n]->mPageRect.Bottom()));
-                                    else
-                                        (*i)->ShowAnkorOnly(Point(mPages[n]->mPageRect.Right(),mPages[n]->mPageRect.Bottom()));
+                                    if ( mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT )
+                                        (*i)->ShowAnchorOnly(Point(mPages[n]->mPageRect.Left(),
+                                                                   mPages[n]->mPageRect.Bottom()));
+                                    else if ( mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_RIGHT )
+                                        (*i)->ShowAnchorOnly(Point(mPages[n]->mPageRect.Right(),
+                                                                   mPages[n]->mPageRect.Bottom()));
                                 }
                                 DBG_ASSERT(mPages[n]->bScrollbar,"SwPostItMgr::LayoutByPage(): note overlaps, but bScrollbar is not true");
                             }
                         }
 
                         // do some magic so we really see the focused note
-                        for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+                        for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
                         {
                                             if ((*i)->HasChildPathFocus())
                             {
@@ -752,7 +773,7 @@ void SwPostItMgr::LayoutPostIts()
                     }
                     else
                     {
-                        for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+                        for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
                                                                 (*i)->SetPosAndSize();
 
                                                         bool bOldScrollbar = mPages[n]->bScrollbar;
@@ -771,9 +792,9 @@ void SwPostItMgr::LayoutPostIts()
             if (!ShowNotes())
             {       // we do not want to see the notes anymore -> Options-Writer-View-Notes
                 bool bRepair = false;
-                for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+                for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
                 {
-                    SwMarginItem* pItem = (*i);
+                    SwSidebarItem* pItem = (*i);
                     if ( !pItem->UseElement() )
                     {
                         DBG_ERROR("PostIt is not in doc!");
@@ -786,7 +807,7 @@ void SwPostItMgr::LayoutPostIts()
                         (*i)->pPostIt->HideNote();
                         if ((*i)->pPostIt->HasChildPathFocus())
                         {
-                            SetActivePostIt(0);
+                            SetActiveSidebarWin(0);
                             (*i)->pPostIt->GrabFocusToDocument();
                         }
                     }
@@ -813,7 +834,7 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const
         return false;
     }
 
-    SwMarginItem_iterator aItem = mPages[aPage-1]->mList->end();
+    SwSidebarItem_iterator aItem = mPages[aPage-1]->mList->end();
     --aItem;
     DBG_ASSERT ((*aItem)->pPostIt,"BorderOverPageBorder: NULL postIt, should never happen");
     if ((*aItem)->pPostIt)
@@ -836,9 +857,9 @@ void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
     const bool bOldUp = ArrowEnabled(KEY_PAGEUP,aPage);
     const bool bOldDown = ArrowEnabled(KEY_PAGEDOWN,aPage);
     const long aSidebarheight = mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height();
-    for(SwMarginItem_iterator i = mPages[aPage-1]->mList->begin(); i!= mPages[aPage-1]->mList->end(); i++)
+    for(SwSidebarItem_iterator i = mPages[aPage-1]->mList->begin(); i!= mPages[aPage-1]->mList->end(); i++)
     {
-        SwMarginWin* pPostIt = (*i)->pPostIt;
+        SwSidebarWin* pPostIt = (*i)->pPostIt;
         // if this is an answer, we should take the normal position and not the real, slightly moved position
         pPostIt->SetVirtualPosSize(pPostIt->GetPosPixel(),pPostIt->GetSizePixel());
         pPostIt->TranslateTopPosition(lScroll);
@@ -855,17 +876,17 @@ void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
             {
                 if ( mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y())).Y() < (mPages[aPage-1]->mPageRect.Top()+aSidebarheight))
                 {
-                    if (mPages[aPage-1]->bMarginSide)
-                        pPostIt->ShowAnkorOnly(Point(mPages[aPage-1]->mPageRect.Left(),mPages[aPage-1]->mPageRect.Top()));
-                    else
-                        pPostIt->ShowAnkorOnly(Point(mPages[aPage-1]->mPageRect.Right(),mPages[aPage-1]->mPageRect.Top()));
+                    if (mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT)
+                        pPostIt->ShowAnchorOnly(Point(mPages[aPage-1]->mPageRect.Left(),mPages[aPage-1]->mPageRect.Top()));
+                    else if (mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_RIGHT)
+                        pPostIt->ShowAnchorOnly(Point(mPages[aPage-1]->mPageRect.Right(),mPages[aPage-1]->mPageRect.Top()));
                 }
                 else
                 {
-                    if (mPages[aPage-1]->bMarginSide)
-                        pPostIt->ShowAnkorOnly(Point(mPages[aPage-1]->mPageRect.Left(),mPages[aPage-1]->mPageRect.Bottom()));
-                    else
-                        pPostIt->ShowAnkorOnly(Point(mPages[aPage-1]->mPageRect.Right(),mPages[aPage-1]->mPageRect.Bottom()));
+                    if (mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT)
+                        pPostIt->ShowAnchorOnly(Point(mPages[aPage-1]->mPageRect.Left(),mPages[aPage-1]->mPageRect.Bottom()));
+                    else if (mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_RIGHT)
+                        pPostIt->ShowAnchorOnly(Point(mPages[aPage-1]->mPageRect.Right(),mPages[aPage-1]->mPageRect.Bottom()));
                 }
             }
         }
@@ -878,7 +899,7 @@ void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
     }
 }
 
-void SwPostItMgr::AutoScroll(const SwMarginWin* pPostIt,const unsigned long aPage )
+void SwPostItMgr::AutoScroll(const SwSidebarWin* pPostIt,const unsigned long aPage )
 {
     // otherwise all notes are visible
     if (mPages[aPage-1]->bScrollbar)
@@ -898,7 +919,7 @@ void SwPostItMgr::AutoScroll(const SwMarginWin* pPostIt,const unsigned long aPag
     }
 }
 
-void SwPostItMgr::MakeVisible(const SwMarginWin* pPostIt,long aPage )
+void SwPostItMgr::MakeVisible(const SwSidebarWin* pPostIt,long aPage )
 {
     if (aPage == -1)
     {
@@ -907,7 +928,7 @@ void SwPostItMgr::MakeVisible(const SwMarginWin* pPostIt,long aPage )
         {
             if (mPages[n]->mList->size()>0)
             {
-                for(SwMarginItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
+                for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
                 {
                     if ((*i)->pPostIt==pPostIt)
                     {
@@ -956,7 +977,7 @@ Color SwPostItMgr::GetArrowColor(USHORT aDirection,unsigned long aPage) const
     }
 }
 
-bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const Rectangle aBorder, long lNeededHeight)
+bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,const Rectangle aBorder, long lNeededHeight)
 {
     /*** General layout idea:***/
     //  - if we have space left, we always move the current one up,
@@ -986,12 +1007,12 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
             bScrollbars = true;
             lTopBorder += GetSidebarScrollerHeight() + 10;
             lBottomBorder -= (GetSidebarScrollerHeight() + 10);
-                for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+                for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
                     (*i)->SetSize(Size((*i)->VirtualSize().getWidth(),(*i)->GetMinimumSizeWithMeta()));
         }
         else
         {
-            for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+            for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
             {
                 if ( (*i)->VirtualSize().getHeight() > lAverageHeight)
                     (*i)->SetSize(Size((*i)->VirtualSize().getWidth(),lAverageHeight));
@@ -1008,9 +1029,9 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
             loop++;
               bDone = true;
             lSpaceUsed = lTopBorder + GetSpaceBetween();
-            for(SwMarginWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+            for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
             {
-                SwMarginWin_iterator aNextPostIt = i;
+                SwSidebarWin_iterator aNextPostIt = i;
                 ++aNextPostIt;
 
                 if (aNextPostIt !=aVisiblePostItList.end())
@@ -1029,7 +1050,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
                             if ( ((*i)->VirtualPos().Y()- lTranslatePos - GetSpaceBetween()) > lTopBorder)
                             {
                                 if ((*aNextPostIt)->IsFollow())
-                                    (*i)->TranslateTopPosition(-1*(lTranslatePos+ANKORLINE_WIDTH));
+                                    (*i)->TranslateTopPosition(-1*(lTranslatePos+ANCHORLINE_WIDTH));
                                 else
                                     (*i)->TranslateTopPosition(-1*(lTranslatePos+GetSpaceBetween()));
                             }
@@ -1038,7 +1059,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
                                 long lMoveUp = (*i)->VirtualPos().Y() - lTopBorder;
                                 (*i)->TranslateTopPosition(-1* lMoveUp);
                                 if ((*aNextPostIt)->IsFollow())
-                                    (*aNextPostIt)->TranslateTopPosition( (lTranslatePos+ANKORLINE_WIDTH) - lMoveUp);
+                                    (*aNextPostIt)->TranslateTopPosition( (lTranslatePos+ANCHORLINE_WIDTH) - lMoveUp);
                                 else
                                     (*aNextPostIt)->TranslateTopPosition( (lTranslatePos+GetSpaceBetween()) - lMoveUp);
                             }
@@ -1047,7 +1068,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
                         {
                             // no space left, left move the next one down
                             if ((*aNextPostIt)->IsFollow())
-                                (*aNextPostIt)->TranslateTopPosition(lTranslatePos+ANKORLINE_WIDTH);
+                                (*aNextPostIt)->TranslateTopPosition(lTranslatePos+ANCHORLINE_WIDTH);
                             else
                                 (*aNextPostIt)->TranslateTopPosition(lTranslatePos+GetSpaceBetween());
                         }
@@ -1066,14 +1087,14 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
                         }
                     }
                     if (aNextPostIt !=aVisiblePostItList.end() && (*aNextPostIt)->IsFollow())
-                        lSpaceUsed += (*i)->VirtualSize().Height() + ANKORLINE_WIDTH;
+                        lSpaceUsed += (*i)->VirtualSize().Height() + ANCHORLINE_WIDTH;
                     else
                         lSpaceUsed += (*i)->VirtualSize().Height() + GetSpaceBetween();
                 }
                 else
                 {
                     //(*i) is the last visible item
-                    SwMarginWin_iterator aPrevPostIt = i;
+                    SwSidebarWin_iterator aPrevPostIt = i;
                     --aPrevPostIt;
                     //lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() + GetSpaceBetween() ) - (*i)->VirtualPos().Y();
                     lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() ) - (*i)->VirtualPos().Y();
@@ -1083,7 +1104,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
                         if ( ((*i)->VirtualPos().Y()+ (*i)->VirtualSize().Height()+lTranslatePos) < lBottomBorder)
                         {
                             if ( (*i)->IsFollow() )
-                                (*i)->TranslateTopPosition(lTranslatePos+ANKORLINE_WIDTH);
+                                (*i)->TranslateTopPosition(lTranslatePos+ANCHORLINE_WIDTH);
                             else
                                 (*i)->TranslateTopPosition(lTranslatePos+GetSpaceBetween());
                         }
@@ -1115,7 +1136,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwMarginWin*> &aVisiblePostItList,const
     else
     {
         // only one left, make sure it is not hidden at the top or bottom
-        SwMarginWin_iterator i = aVisiblePostItList.begin();
+        SwSidebarWin_iterator i = aVisiblePostItList.begin();
         lTranslatePos = lTopBorder - (*i)->VirtualPos().Y();
         if (lTranslatePos>0)
         {
@@ -1168,11 +1189,11 @@ void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus)
         PrepareView(true);
 }
 
-void SwPostItMgr::RemoveMarginWin()
+void SwPostItMgr::RemoveSidebarWin()
 {
     if (!mvPostItFlds.empty())
     {
-        for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         {
             EndListening( *((*i)->GetBroadCaster()) );
             if ((*i)->pPostIt)
@@ -1192,8 +1213,10 @@ void SwPostItMgr::RemoveMarginWin()
 void SwPostItMgr::Delete(String aAuthor)
 {
     mpWrtShell->StartAllAction();
-    if ( GetActivePostIt() && (GetActivePostIt()->GetAuthor()==aAuthor) )
-        SetActivePostIt(0);
+    if ( HasActiveSidebarWin() && (GetActiveSidebarWin()->GetAuthor()==aAuthor) )
+    {
+        SetActiveSidebarWin(0);
+    }
     SwRewriter aRewriter;
     String aUndoString = SW_RES(STR_DELETE_AUTHOR_NOTES);
     aUndoString += aAuthor;
@@ -1202,7 +1225,7 @@ void SwPostItMgr::Delete(String aAuthor)
 
     std::vector<SwFmtFld*> aTmp;
     aTmp.reserve( mvPostItFlds.size() );
-    for(std::list<SwMarginItem*>::iterator pPostIt = mvPostItFlds.begin(); pPostIt!= mvPostItFlds.end() ; pPostIt++)
+    for(std::list<SwSidebarItem*>::iterator pPostIt = mvPostItFlds.begin(); pPostIt!= mvPostItFlds.end() ; pPostIt++)
     {
         if ((*pPostIt)->GetFmtFld() && ((*pPostIt)->pPostIt->GetAuthor() == aAuthor) )
             aTmp.push_back( (*pPostIt)->GetFmtFld() );
@@ -1212,36 +1235,6 @@ void SwPostItMgr::Delete(String aAuthor)
         mpWrtShell->GotoField( *(*i) );
         mpWrtShell->DelRight();
     }
-    /*
-    for(std::list<SwPostItItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end(); )
-        {
-            SwPostItItem* pItem = (*i);
-            SwPostItField* pPostItField = static_cast<SwPostItField*>(pItem->pFmtFld->GetFld());
-            if (pPostItField->GetPar1() == aAuthor)
-            {
-                // stop listening, we delete ourselves
-                EndListening( *(pItem->pFmtFld) );
-
-                // remove reference to yet-to-die postit
-                if (pItem->pPostIt == GetActivePostIt())
-                    SetActivePostIt(0);
-
-                // delete the actual SwPostItField
-                mpWrtShell->GotoField(*pItem->pFmtFld);
-                mpWrtShell->DelRight();
-                i = mvPostItFlds.erase(i);
-
-                // delete visual representation
-                // lazy delete doesn't work because references to document (mpFmtFld, mpView etc. may be dead before deletion)
-                delete pItem->pPostIt;
-
-                // delete struct saving the pointers
-                delete pItem;
-            }
-            else
-                ++i;
-        }
-    */
     mpWrtShell->EndUndo( UNDO_DELETE );
     PrepareView();
     mpWrtShell->EndAllAction();
@@ -1253,14 +1246,14 @@ void SwPostItMgr::Delete(String aAuthor)
 void SwPostItMgr::Delete()
 {
     mpWrtShell->StartAllAction();
-    SetActivePostIt(0);
+    SetActiveSidebarWin(0);
     SwRewriter aRewriter;
     aRewriter.AddRule(UNDO_ARG1, SW_RES(STR_DELETE_ALL_NOTES) );
     mpWrtShell->StartUndo( UNDO_DELETE, &aRewriter );
 
     std::vector<SwFmtFld*> aTmp;
     aTmp.reserve( mvPostItFlds.size() );
-    for(std::list<SwMarginItem*>::iterator pPostIt = mvPostItFlds.begin(); pPostIt!= mvPostItFlds.end() ; pPostIt++)
+    for(std::list<SwSidebarItem*>::iterator pPostIt = mvPostItFlds.begin(); pPostIt!= mvPostItFlds.end() ; pPostIt++)
     {
         if ((*pPostIt)->GetFmtFld())
             aTmp.push_back( (*pPostIt)->GetFmtFld() );
@@ -1298,7 +1291,7 @@ void SwPostItMgr::Delete()
 
 void SwPostItMgr::Hide(SwPostItField* pPostItField )
 {
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         if ((*i)->GetFmtFld())
         {
@@ -1317,7 +1310,7 @@ void SwPostItMgr::Hide(SwPostItField* pPostItField )
 
 void SwPostItMgr::Hide( const String& rAuthor )
 {
-    for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         if ( (*i)->pPostIt && ((*i)->pPostIt->GetAuthor() == rAuthor) )
         {
@@ -1331,7 +1324,7 @@ void SwPostItMgr::Hide( const String& rAuthor )
 
 void SwPostItMgr::Hide()
 {
-    for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         (*i)->bShow = false;
         (*i)->pPostIt->HideNote();
@@ -1341,7 +1334,7 @@ void SwPostItMgr::Hide()
 
 void SwPostItMgr::Show()
 {
-    for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         (*i)->bShow = true;
     }
@@ -1369,7 +1362,7 @@ void SwPostItMgr::Sort(const short aType)
     }
 }
 
-SwMarginWin* SwPostItMgr::GetPostIt(SfxBroadcaster* pBroadcaster) const
+SwSidebarWin* SwPostItMgr::GetPostIt(SfxBroadcaster* pBroadcaster) const
 {
     for(const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
@@ -1379,17 +1372,17 @@ SwMarginWin* SwPostItMgr::GetPostIt(SfxBroadcaster* pBroadcaster) const
     return NULL;
 }
 
-SwPostIt* SwPostItMgr::GetPostIt(SwPostItField* pFld) const
+sw::annotation::SwAnnotationWin* SwPostItMgr::GetPostIt(SwPostItField* pFld) const
 {
     for(const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         if ( (*i)->GetFmtFld() && ((*i)->GetFmtFld()->GetFld() == pFld) )
-            return static_cast<SwPostIt*>((*i)->pPostIt);
+            return dynamic_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt);
     }
     return NULL;
 }
 
-SwMarginWin* SwPostItMgr::GetPostIt( const SfxBroadcaster* pBroadcaster) const
+SwSidebarWin* SwPostItMgr::GetPostIt( const SfxBroadcaster* pBroadcaster) const
 {
     for(const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
@@ -1399,12 +1392,12 @@ SwMarginWin* SwPostItMgr::GetPostIt( const SfxBroadcaster* pBroadcaster) const
     return NULL;
 }
 
-SwPostIt* SwPostItMgr::GetPostIt(const SwPostItField* pFld) const
+sw::annotation::SwAnnotationWin* SwPostItMgr::GetPostIt(const SwPostItField* pFld) const
 {
     for(const_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
     {
         if ( (*i)->GetFmtFld() && ((*i)->GetFmtFld()->GetFld() == pFld))
-            return static_cast<SwPostIt*>((*i)->pPostIt);
+            return dynamic_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt);
     }
     return NULL;
 }
@@ -1433,15 +1426,16 @@ bool SwPostItMgr::ShowPreview(const SwField* pFld, SwFmtFld*& pFmtFld) const
     return false;
 }
 
-SwMarginWin* SwPostItMgr::GetNextPostIt(USHORT aDirection, SwMarginWin* aPostIt)
+SwSidebarWin* SwPostItMgr::GetNextPostIt( USHORT aDirection,
+                                          SwSidebarWin* aPostIt )
 {
     if (mvPostItFlds.size()>1)
     {
-        for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         {
             if ( (*i)->pPostIt ==aPostIt)
             {
-                SwMarginItem_iterator iNextPostIt   = i;
+                SwSidebarItem_iterator iNextPostIt  = i;
                 if (aDirection==KEY_PAGEUP)
                 {
                     if ( iNextPostIt==mvPostItFlds.begin() )
@@ -1474,11 +1468,11 @@ long SwPostItMgr::GetNextBorder()
 {
     for (unsigned long n=0;n<mPages.size();n++)
     {
-        for(SwMarginItem_iterator b = mPages[n]->mList->begin(); b!= mPages[n]->mList->end(); b++)
+        for(SwSidebarItem_iterator b = mPages[n]->mList->begin(); b!= mPages[n]->mList->end(); b++)
         {
             if ((*b)->pPostIt == mpActivePostIt)
             {
-                SwMarginItem_iterator aNext = b;
+                SwSidebarItem_iterator aNext = b;
                 aNext++;
                 bool bFollow = (aNext == mPages[n]->mList->end()) ? false : (*aNext)->pPostIt->IsFollow();
                 if ( mPages[n]->bScrollbar || bFollow )
@@ -1511,15 +1505,15 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor)
             {
                 // reset old one if still alive
                 // TODO: does not work properly if mouse and cursor was set
-                SwPostIt* pOldPostIt = GetPostIt(mShadowState.mpShadowFld);
+                sw::annotation::SwAnnotationWin* pOldPostIt = GetPostIt(mShadowState.mpShadowFld);
                 if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT))
-                    pOldPostIt->SetViewState(SS_NORMAL);
+                    pOldPostIt->SetViewState(VS_NORMAL);
             }
             //set new one, if it is not currently edited
-            SwPostIt* pNewPostIt = GetPostIt(pFld);
+            sw::annotation::SwAnnotationWin* pNewPostIt = GetPostIt(pFld);
             if (pNewPostIt && pNewPostIt->Shadow() && (pNewPostIt->Shadow()->GetShadowState() != SS_EDIT))
             {
-                pNewPostIt->SetViewState(SS_VIEW);
+                pNewPostIt->SetViewState(VS_VIEW);
                 //remember our new field
                 mShadowState.mpShadowFld = pFld;
                 mShadowState.bCursor = false;
@@ -1542,10 +1536,10 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor)
             if (!mShadowState.bCursor && !mShadowState.bMouse)
             {
                 // reset old one if still alive
-                SwPostIt* pOldPostIt = GetPostIt(mShadowState.mpShadowFld);
+                sw::annotation::SwAnnotationWin* pOldPostIt = GetPostIt(mShadowState.mpShadowFld);
                 if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT))
                 {
-                    pOldPostIt->SetViewState(SS_NORMAL);
+                    pOldPostIt->SetViewState(VS_NORMAL);
                     mShadowState.mpShadowFld = 0;
                 }
             }
@@ -1587,8 +1581,9 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel)
         {
             Rectangle aRect;
             DBG_ASSERT(mPages.size()>nPageNum-1,"SwPostitMgr:: page container size wrong");
-            aRect = mPages[nPageNum-1]->bMarginSide ? Rectangle(Point(aPageFrm.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrm.Top()),Size(GetSidebarWidth(),aPageFrm.Height())) :
-                            Rectangle( Point(aPageFrm.Right()+GetSidebarBorderWidth(),aPageFrm.Top()) , Size(GetSidebarWidth(),aPageFrm.Height()));
+            aRect = mPages[nPageNum-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                    ? Rectangle(Point(aPageFrm.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrm.Top()),Size(GetSidebarWidth(),aPageFrm.Height()))
+                    : Rectangle( Point(aPageFrm.Right()+GetSidebarBorderWidth(),aPageFrm.Top()) , Size(GetSidebarWidth(),aPageFrm.Height()));
             if (aRect.IsInside(aPoint))
             {
                 // we hit the note's sidebar
@@ -1605,8 +1600,9 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel)
 Rectangle SwPostItMgr::GetBottomScrollRect(const unsigned long aPage) const
 {
     SwRect aPageRect = mPages[aPage-1]->mPageRect;
-    Point aPointBottom = mPages[aPage-1]->bMarginSide ? Point(aPageRect.Left() - GetSidebarWidth() - GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height()) :
-                                    Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height());
+    Point aPointBottom = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                         ? Point(aPageRect.Left() - GetSidebarWidth() - GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height())
+                         : Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height());
     Size aSize(GetSidebarWidth() - mpEditWin->PixelToLogic(Size(4,0)).Width(), mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height()) ;
     return Rectangle(aPointBottom,aSize);
 
@@ -1615,8 +1611,9 @@ Rectangle SwPostItMgr::GetBottomScrollRect(const unsigned long aPage) const
 Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const
 {
     SwRect aPageRect = mPages[aPage-1]->mPageRect;
-    Point aPointTop = mPages[aPage-1]->bMarginSide ?    Point(aPageRect.Left() - GetSidebarWidth() -GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()) :
-                                        Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height());
+    Point aPointTop = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                      ? Point(aPageRect.Left() - GetSidebarWidth() -GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height())
+                      : Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height());
     Size aSize(GetSidebarWidth() - mpEditWin->PixelToLogic(Size(4,0)).Width(), mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height()) ;
     return Rectangle(aPointTop,aSize);
 }
@@ -1626,11 +1623,13 @@ Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const
 bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint)
 {
     SwRect aPageRect = mPages[aPage-1]->mPageRect;
-    Point aPointBottom = mPages[aPage-1]->bMarginSide ? Point(aPageRect.Left() - GetSidebarWidth()-GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height()) :
-                                    Point(aPageRect.Right() + GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height());
+    Point aPointBottom = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                         ? Point(aPageRect.Left() - GetSidebarWidth()-GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height())
+                         : Point(aPageRect.Right() + GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height());
 
-    Point aPointTop = mPages[aPage-1]->bMarginSide ?    Point(aPageRect.Left() - GetSidebarWidth()-GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()) :
-                                Point(aPageRect.Right()+GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height());
+    Point aPointTop = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                      ? Point(aPageRect.Left() - GetSidebarWidth()-GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height())
+                      : Point(aPageRect.Right()+GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height());
 
     Rectangle aRectBottom(GetBottomScrollRect(aPage));
     Rectangle aRectTop(GetTopScrollRect(aPage));
@@ -1661,8 +1660,8 @@ void SwPostItMgr::CorrectPositions()
        return;
 
    // find first valid note
-   SwMarginWin *pFirstPostIt = 0;
-   for(SwMarginItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+   SwSidebarWin *pFirstPostIt = 0;
+   for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
    {
        pFirstPostIt = (*i)->pPostIt;
        if (pFirstPostIt)
@@ -1674,22 +1673,22 @@ void SwPostItMgr::CorrectPositions()
        return;
 
    // yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
-   const long aAnkorX = mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Ankor()->GetSixthPosition().getX()),0)).X();
-   const long aAnkorY = mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Ankor()->GetSixthPosition().getY()))).Y() + 1;
+   const long aAnkorX = mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X();
+   const long aAnkorY = mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1;
    if (Point(aAnkorX,aAnkorY) != pFirstPostIt->GetPosPixel())
    {
        long aAnkorPosX = 0;
        long aAnkorPosY = 0;
        for (unsigned long n=0;n<mPages.size();n++)
        {
-           for(SwMarginItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
+           for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
            {
                if ((*i)->bShow && (*i)->pPostIt)
                {
-                    aAnkorPosX = mPages[n]->bMarginSide ?
-                        mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Ankor()->GetSeventhPosition().getX()),0)).X() :
-                        mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Ankor()->GetSixthPosition().getX()),0)).X();
-                    aAnkorPosY = mpEditWin->LogicToPixel( Point(0,(long)((*i)->pPostIt->Ankor()->GetSixthPosition().getY()))).Y() + 1;
+                    aAnkorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
+                        ? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X()
+                        : mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSixthPosition().getX()),0)).X();
+                    aAnkorPosY = mpEditWin->LogicToPixel( Point(0,(long)((*i)->pPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1;
                     (*i)->pPostIt->SetPosPixel(Point(aAnkorPosX,aAnkorPosY));
                }
            }
@@ -1776,14 +1775,14 @@ Color SwPostItMgr::GetColorAnkor(sal_uInt16 aAuthorIndex)
         return Color(COL_WHITE);
 }
 
-void SwPostItMgr::SetActivePostIt( SwMarginWin* p)
+void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p)
 {
     if ( p != mpActivePostIt )
     {
         // we need the temp variable so we can set mpActivePostIt before we call DeactivatePostIt
         // therefore we get a new layout in DOCCHANGED when switching from postit to document,
         // otherwise, GetActivePostIt() would still hold our old postit
-        SwMarginWin* pActive = mpActivePostIt;
+        SwSidebarWin* pActive = mpActivePostIt;
         mpActivePostIt = p;
         if (pActive)
         {
@@ -1820,7 +1819,7 @@ IMPL_LINK( SwPostItMgr, CalcHdl, void*, /* pVoid*/  )
 
 void SwPostItMgr::Rescale()
 {
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->Rescale();
 }
@@ -1857,21 +1856,21 @@ sal_Int32 SwPostItMgr::GetSidebarScrollerHeight() const
 
 void SwPostItMgr::SetSpellChecking()
 {
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->SetSpellChecking();
 }
 
 void SwPostItMgr::SetReadOnlyState()
 {
-    for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->SetReadonly( mbReadOnly );
 }
 
 void SwPostItMgr::CheckMetaText()
 {
-        for(std::list<SwMarginItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
                 if ( (*i)->pPostIt )
                        (*i)->pPostIt->CheckMetaText();
 
@@ -1879,45 +1878,45 @@ void SwPostItMgr::CheckMetaText()
 
 sal_uInt16 SwPostItMgr::Replace(SvxSearchItem* pItem)
 {
-    SwMarginWin* pWin = GetActivePostIt();
-    sal_uInt16 aResult = pWin->View()->StartSearchAndReplace( *pItem );
+    SwSidebarWin* pWin = GetActiveSidebarWin();
+    sal_uInt16 aResult = pWin->GetOutlinerView()->StartSearchAndReplace( *pItem );
     if (!aResult)
-        SetActivePostIt(0);
+        SetActiveSidebarWin(0);
     return aResult;
 }
 
 sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
 {
-    SwMarginWin* pWin = GetActivePostIt();
+    SwSidebarWin* pWin = GetActiveSidebarWin();
     SvxSearchItem aItem(SID_SEARCH_ITEM );
     aItem.SetSearchOptions(rSearchOptions);
     aItem.SetBackward(!bSrchForward);
-    sal_uInt16 aResult = pWin->View()->StartSearchAndReplace( aItem );
+    sal_uInt16 aResult = pWin->GetOutlinerView()->StartSearchAndReplace( aItem );
     if (!aResult)
-        SetActivePostIt(0);
+        SetActiveSidebarWin(0);
     return aResult;
 }
 
 sal_uInt16 SwPostItMgr::SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
 {
     sal_uInt16 aResult = 0;
-    SwMarginWin* pWin = GetPostIt(&pFld);
+    SwSidebarWin* pWin = GetPostIt(&pFld);
     if (pWin)
     {
-        ESelection aOldSelection = pWin->View()->GetSelection();
+        ESelection aOldSelection = pWin->GetOutlinerView()->GetSelection();
         if (bSrchForward)
-            pWin->View()->SetSelection(ESelection(0,0,0,0));
+            pWin->GetOutlinerView()->SetSelection(ESelection(0,0,0,0));
         else
-            pWin->View()->SetSelection(ESelection(0xFFFF,0xFFFF,0xFFFF,0xFFFF));
+            pWin->GetOutlinerView()->SetSelection(ESelection(0xFFFF,0xFFFF,0xFFFF,0xFFFF));
         SvxSearchItem aItem(SID_SEARCH_ITEM );
         aItem.SetSearchOptions(rSearchOptions);
         aItem.SetBackward(!bSrchForward);
-        aResult = pWin->View()->StartSearchAndReplace( aItem );
+        aResult = pWin->GetOutlinerView()->StartSearchAndReplace( aItem );
         if (!aResult)
-            pWin->View()->SetSelection(aOldSelection);
+            pWin->GetOutlinerView()->SetSelection(aOldSelection);
         else
         {
-            SetActivePostIt(pWin);
+            SetActiveSidebarWin(pWin);
             MakeVisible(pWin);
         }
     }
@@ -1948,3 +1947,54 @@ void SwPostItMgr::AssureStdModeAtShell()
                 mpView->StopShellTimer();
         }
 }
+
+bool SwPostItMgr::HasActiveSidebarWin() const
+{
+    return mpActivePostIt != 0;
+}
+
+bool SwPostItMgr::HasActiveAnnotationWin() const
+{
+    return HasActiveSidebarWin() &&
+           dynamic_cast<sw::annotation::SwAnnotationWin*>(mpActivePostIt) != 0;
+}
+
+void SwPostItMgr::GrabFocusOnActiveSidebarWin()
+{
+    if ( HasActiveSidebarWin() )
+    {
+        mpActivePostIt->GrabFocus();
+    }
+}
+
+void SwPostItMgr::UpdateDataOnActiveSidebarWin()
+{
+    if ( HasActiveSidebarWin() )
+    {
+        mpActivePostIt->UpdateData();
+    }
+}
+
+void SwPostItMgr::DeleteActiveSidebarWin()
+{
+    if ( HasActiveSidebarWin() )
+    {
+        mpActivePostIt->Delete();
+    }
+}
+
+void SwPostItMgr::HideActiveSidebarWin()
+{
+    if ( HasActiveSidebarWin() )
+    {
+        mpActivePostIt->Hide();
+    }
+}
+
+void SwPostItMgr::ToggleInsModeOnActiveSidebarWin()
+{
+    if ( HasActiveSidebarWin() )
+    {
+        mpActivePostIt->ToggleInsMode();
+    }
+}