Commits

hr  committed cfc88ad

#i10000#: reolve merge conflicts (CWS notes7)

  • Participants
  • Parent commits d7dd6a5

Comments (0)

Files changed (2)

File sw/source/ui/docvw/edtwin2.cxx

 /*--------------------------------------------------------------------
 	Beschreibung:	KeyEvents
  --------------------------------------------------------------------*/
-static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL /*bBalloon*/ )
+static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL bBalloon )
 {
 	USHORT nResId = 0;
 	switch( rRedl.GetType() )

File sw/source/ui/docvw/postit.cxx

 	return sal_True;
 }
 
-XubString PostItTxt::GetSurroundingText() const
-{
-   XubString sRet;
-   if( mpOutlinerView )
-   {
-       EditEngine *aEditEngine = mpOutlinerView->GetEditView().GetEditEngine();
-       if( mpOutlinerView->HasSelection() )
-           sRet = mpOutlinerView->GetSelected();
-       else
-       {
-           ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
-           sRet = aEditEngine->GetText(aSelection.nStartPara);
-       }
-   }
-   return sRet;
-}
-
-Selection PostItTxt::GetSurroundingTextSelection() const
-{
-   Selection aRet( 0, 0 );
-   if( mpOutlinerView )
-   {
-       if( mpOutlinerView->HasSelection() )
-           aRet = Selection( 0, mpOutlinerView->GetSelected().Len() );
-       else
-       {       
-           ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
-           aRet = Selection( aSelection.nStartPos, aSelection.nEndPos );
-       }
-   }
-   return aRet;
-}
-
 /************** SwMarginWin***********************************++*/
 SwMarginWin::SwMarginWin(Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits)
 : Window(pParent, nBits),