diff options
author | Peter Burow <pb@openoffice.org> | 2001-07-05 07:30:33 +0000 |
---|---|---|
committer | Peter Burow <pb@openoffice.org> | 2001-07-05 07:30:33 +0000 |
commit | ab35ddff85e9443ef30f89034e856e06fbf6c17a (patch) | |
tree | c029f37b40ddd39e22baea9bea0169d7c7b117d8 /svx/source/outliner/outlvw.cxx | |
parent | bf86b87eec9ce10696ba325e5967e395ef5e937d (diff) |
fix: #89181# TF_SVDATA fixed
Diffstat (limited to 'svx/source/outliner/outlvw.cxx')
-rw-r--r-- | svx/source/outliner/outlvw.cxx | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index 045191d8f6..ccb70f8c92 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outlvw.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mt $ $Date: 2001-06-21 13:03:30 $ + * last change: $Author: pb $ $Date: 2001-07-05 08:30:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,9 +86,11 @@ #include <svtools/itemset.hxx> #endif +#ifndef TF_SVDATA #ifndef _SV_DRAG_HXX //autogen #include <vcl/drag.hxx> #endif +#endif #ifndef _EDITSTAT_HXX //autogen #include <editstat.hxx> @@ -230,14 +232,14 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt ) { if ( !bReadOnly && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) { - if ( ( pOwner->ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) && - ( pOwner->ImplGetOutlinerMode() != OUTLINERMODE_TITLEOBJECT ) && + if ( ( pOwner->ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) && + ( pOwner->ImplGetOutlinerMode() != OUTLINERMODE_TITLEOBJECT ) && ( bSelection || !aSel.nStartPos ) ) { Indent( aKeyCode.IsShift() ? (-1) : (+1) ); bKeyProcessed = TRUE; } - else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) && + else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) && !bSelection && !aSel.nEndPos && pOwner->ImplHasBullet( aSel.nEndPara ) ) { Indent( aKeyCode.IsShift() ? (-1) : (+1) ); @@ -368,7 +370,7 @@ Pointer OutlinerView::ImpGetMousePointer( MouseTarget eTarget ) switch(eTarget) { - case MouseText: + case MouseText: { if(GetOutliner() && GetOutliner()->IsVertical()) return Pointer(POINTER_TEXT_VERTICAL); @@ -478,6 +480,7 @@ BOOL __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) return pEditView->MouseButtonUp( rMEvt ); } +#ifndef TF_SVDATA void OutlinerView::ImpDrag( const MouseEvent& rMEvt ) { @@ -554,6 +557,8 @@ void OutlinerView::ImpDrag( const MouseEvent& rMEvt ) bInDragMode = FALSE; } +#endif // TF_SVDATA + void OutlinerView::ImpHideDDCursor() { DBG_CHKTHIS(OutlinerView,0); @@ -672,7 +677,7 @@ ULONG OutlinerView::Select( Paragraph* pParagraph, BOOL bSelect, BOOL bWithChilds ) { DBG_CHKTHIS(OutlinerView,0); - + ULONG nPara = pOwner->pParaList->GetAbsPos( pParagraph ); USHORT nEnd = 0; if ( bSelect ) @@ -1055,6 +1060,7 @@ Point OutlinerView::ImpGetDocPos( const Point& rPosPixel ) return aCurPosDoc; } +#ifndef TF_SVDATA BOOL __EXPORT OutlinerView::QueryDrop( DropEvent& rDEvt ) { @@ -1100,7 +1106,6 @@ BOOL __EXPORT OutlinerView::QueryDrop( DropEvent& rDEvt ) return bRetVal; } - BOOL __EXPORT OutlinerView::Drop( const DropEvent& rDEvt ) { DBG_CHKTHIS(OutlinerView,0); @@ -1181,6 +1186,7 @@ BOOL __EXPORT OutlinerView::Drop( const DropEvent& rDEvt ) return TRUE; } +#endif // TF_SVDATA // MT 05/00: Wofuer dies ImpXXXScroll, sollte das nicht die EditEngine machen??? @@ -1531,11 +1537,13 @@ void OutlinerView::Command( const CommandEvent& rCEvt ) if( ( rCEvt.GetCommand() == COMMAND_STARTDRAG ) && bBeginDragAtMove ) { +#ifndef TF_SVDATA // ImpDrag braucht Abstand von MouseButtonDown-Position Point aPos( pEditView->GetWindow()->GetPointerPosPixel() ); aPos = pEditView->GetWindow()->ScreenToOutputPixel( aPos ); MouseEvent aEvt( aPos ); ImpDrag( aEvt ); +#endif } else pEditView->Command( rCEvt ); @@ -1952,7 +1960,7 @@ ULONG OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect, USHORT nChangesStart = aOldSel.nStartPara; USHORT nChangesEnd = nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara); - for ( USHORT n = nChangesStart; n <= nChangesEnd; n++ ) + for ( USHORT n = nChangesStart; n <= nChangesEnd; n++ ) { if ( eFormat == EE_FORMAT_BIN ) { @@ -1962,11 +1970,11 @@ ULONG OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect, nDepth = rLevel.GetValue(); pOwner->ImplInitDepth( n, nDepth, FALSE ); } - + if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) pOwner->ImplSetLevelDependendStyleSheet( n ); } - + if ( eFormat != EE_FORMAT_BIN ) { pOwner->ImpFilterIndents( nChangesStart, nChangesEnd ); |