diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 16:21:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 16:21:09 +0000 |
| commit | b3cd778cc0077e15f0f97864829d4bd52c33947f (patch) | |
| tree | 8814dbbd6522f3b978ebf7ca5f2be18cdb29b255 /sw | |
| parent | f85e42b646aefa8d15699e0d7ba38b4c75a0ff70 (diff) | |
#i10000#: reolve merge conflicts (CWS notes7)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/postit.cxx | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 6f397520be2c..bf60c53372b2 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -97,7 +97,7 @@ /*-------------------------------------------------------------------- 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() ) diff --git a/sw/source/ui/docvw/postit.cxx b/sw/source/ui/docvw/postit.cxx index 50352f5faf79..51a1ca06e491 100644 --- a/sw/source/ui/docvw/postit.cxx +++ b/sw/source/ui/docvw/postit.cxx @@ -570,39 +570,6 @@ IMPL_LINK( PostItTxt, WindowEventListener, VclSimpleEvent*, pWinEvent ) 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), |