mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove commented out code

Browse Source 
Remove old, already commented out code and useless code documentation
(basically restating the function names). Also translate the few Germany
comments in that file.

This file still lacks a good doxygen code documentation or a brief
description of what it actually does.

Change-Id: I339a01dbd4ea894be13293133b8dedbc55c2bbac
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth
2012-06-21 12:12:14 +02:00
committed by Bjoern Michaelsen
parent 1266480d38
commit e7bbaefa47
1 changed files with 21 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
sw/source/core/view/vdraw.cxx
View File

@@ -35,8 +35,6 @@
#include <fmtanchr.hxx> #include <fmtanchr.hxx>
#include <frmfmt.hxx> #include <frmfmt.hxx>
/// OD 29.08.2002 #102450#
/// include <svx/svdoutl.hxx>
#include <svx/svdoutl.hxx> #include <svx/svdoutl.hxx>
#include "fesh.hxx" #include "fesh.hxx"
@@ -54,114 +52,49 @@
#include <IDocumentDrawModelAccess.hxx> #include <IDocumentDrawModelAccess.hxx>
/*************************************************************************
|*
|* SwSaveHdl
|*
|* Ersterstellung MA 14. Feb. 95
|* Letzte Aenderung MA 02. Jun. 98
|*
|*************************************************************************/
//SwSaveHdl::SwSaveHdl( SwViewImp *pI ) :
// pImp( pI ),
// bXorVis( FALSE )
//{
//if ( pImp->HasDrawView() )
//{
// bXorVis = pImp->GetDrawView()->IsShownXorVisible( pImp->GetShell()->GetOut());
// if ( bXorVis )
// pImp->GetDrawView()->HideShownXor( pImp->GetShell()->GetOut() );
//}
//}
//SwSaveHdl::~SwSaveHdl()
//{
//if ( bXorVis )
// pImp->GetDrawView()->ShowShownXor( pImp->GetShell()->GetOut() );
//}
/*************************************************************************
|*
|* SwViewImp::StartAction(), EndAction()
|*
|* Ersterstellung MA 14. Feb. 95
|* Letzte Aenderung MA 14. Sep. 98
|*
|*************************************************************************/
void SwViewImp::StartAction() void SwViewImp::StartAction()
{ {
if ( HasDrawView() ) if ( HasDrawView() )
{ {
SET_CURR_SHELL( GetShell() ); SET_CURR_SHELL( GetShell() );
if ( pSh->ISA(SwFEShell) ) if ( pSh->ISA(SwFEShell) )
((SwFEShell*)pSh)->HideChainMarker(); //Kann sich geaendert haben ((SwFEShell*)pSh)->HideChainMarker(); // might have changed
//bResetXorVisibility = GetDrawView()->IsShownXorVisible( GetShell()->GetOut());
//GetDrawView()->HideShownXor( GetShell()->GetOut() );
} }
} }
void SwViewImp::EndAction() void SwViewImp::EndAction()
{ {
if ( HasDrawView() ) if ( HasDrawView() )
{ {
SET_CURR_SHELL( GetShell() ); SET_CURR_SHELL( GetShell() );
//if ( bResetXorVisibility )
// GetDrawView()->ShowShownXor( GetShell()->GetOut() );
if ( pSh->ISA(SwFEShell) ) if ( pSh->ISA(SwFEShell) )
((SwFEShell*)pSh)->SetChainMarker(); //Kann sich geaendert haben ((SwFEShell*)pSh)->SetChainMarker(); // might have changed
} }
} }
/*************************************************************************
|*
|* SwViewImp::LockPaint(), UnlockPaint()
|*
|* Ersterstellung MA 11. Jun. 96
|* Letzte Aenderung MA 11. Jun. 96
|*
|*************************************************************************/
void SwViewImp::LockPaint() void SwViewImp::LockPaint()
{ {
if ( HasDrawView() ) if ( HasDrawView() )
{ {
//HMHbShowHdlPaint = GetDrawView()->IsMarkHdlShown();
//HMHif ( bShowHdlPaint )
//HMH GetDrawView()->HideMarkHdl();
bResetHdlHiddenPaint = !GetDrawView()->areMarkHandlesHidden(); bResetHdlHiddenPaint = !GetDrawView()->areMarkHandlesHidden();
GetDrawView()->hideMarkHandles(); GetDrawView()->hideMarkHandles();
} }
else else
{ {
//HMHbShowHdlPaint = FALSE;
bResetHdlHiddenPaint = sal_False; bResetHdlHiddenPaint = sal_False;
} }
} }
void SwViewImp::UnlockPaint() void SwViewImp::UnlockPaint()
{ {
if ( bResetHdlHiddenPaint ) if ( bResetHdlHiddenPaint )
GetDrawView()->showMarkHandles(); GetDrawView()->showMarkHandles();
//HMHif ( bShowHdlPaint )
//HMH GetDrawView()->ShowMarkHdl();
} }
/*************************************************************************
|*
|* SwViewImp::PaintLayer(), PaintDispatcher()
|*
|* Ersterstellung MA 20. Dec. 94
|* Letzte Aenderung AMA 04. Jun. 98
|*
|*************************************************************************/
// OD 29.08.2002 #102450#
// add 3rd paramter <const Color* pPageBackgrdColor> for setting this
// color as the background color at the outliner of the draw view.
// OD 09.12.2002 #103045# - add 4th parameter for the horizontal text direction
// of the page in order to set the default horizontal text direction at the
// outliner of the draw view for painting layers <hell> and <heaven>.
// OD 25.06.2003 #108784# - correct type of 1st parameter
void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
SwPrintData const*const pPrintData, SwPrintData const*const pPrintData,
const SwRect& , const SwRect& ,
@@ -182,13 +115,13 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
} }
// OD 29.08.2002 #102450# // For correct handling of accessibility, high contrast, the
// For correct handling of accessibility, high contrast, the page background // page background color is set as the background color at the
// color is set as the background color at the outliner of the draw view. // outliner of the draw view. Only necessary for the layers
// Only necessary for the layers hell and heaven // hell and heaven
Color aOldOutlinerBackgrdColor; Color aOldOutlinerBackgrdColor;
// OD 09.12.2002 #103045# - set default horizontal text direction on // set default horizontal text direction on painting <hell> or
// painting <hell> or <heaven>. // <heaven>.
EEHorizontalTextDirection aOldEEHoriTextDir = EE_HTEXTDIR_L2R; EEHorizontalTextDirection aOldEEHoriTextDir = EE_HTEXTDIR_L2R;
const IDocumentDrawModelAccess* pIDDMA = GetShell()->getIDocumentDrawModelAccess(); const IDocumentDrawModelAccess* pIDDMA = GetShell()->getIDocumentDrawModelAccess();
if ( (_nLayerID == pIDDMA->GetHellId()) || if ( (_nLayerID == pIDDMA->GetHellId()) ||
@@ -220,9 +153,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
GetPageView()->DrawLayer( _nLayerID, pOutDev, pRedirector ); GetPageView()->DrawLayer( _nLayerID, pOutDev, pRedirector );
pOutDev->Pop(); pOutDev->Pop();
// OD 29.08.2002 #102450# // reset background color of the outliner & default horiz. text dir.
// reset background color of the outliner
// OD 09.12.2002 #103045# - reset default horizontal text direction
if ( (_nLayerID == pIDDMA->GetHellId()) || if ( (_nLayerID == pIDDMA->GetHellId()) ||
(_nLayerID == pIDDMA->GetHeavenId()) ) (_nLayerID == pIDDMA->GetHeavenId()) )
{ {
@@ -234,14 +165,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
} }
} }
/*************************************************************************
|*
|* SwViewImp::IsDragPossible()
|*
|* Ersterstellung MA 19. Jan. 93
|* Letzte Aenderung MA 16. Jan. 95
|*
|*************************************************************************/
#define WIEDUWILLST 400 #define WIEDUWILLST 400
sal_Bool SwViewImp::IsDragPossible( const Point &rPoint ) sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
@@ -273,14 +197,6 @@ sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
return aRect.IsInside( rPoint ); return aRect.IsInside( rPoint );
} }
/*************************************************************************
|*
|* SwViewImp::NotifySizeChg()
|*
|* Ersterstellung MA 23. Jun. 93
|* Letzte Aenderung MA 05. Oct. 98
|*
|*************************************************************************/
void SwViewImp::NotifySizeChg( const Size &rNewSz ) void SwViewImp::NotifySizeChg( const Size &rNewSz )
{ {
@@ -290,7 +206,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( GetPageView() ) if ( GetPageView() )
GetPageView()->GetPage()->SetSize( rNewSz ); GetPageView()->GetPage()->SetSize( rNewSz );
//Begrenzung des Arbeitsbereiches. // Limitation of the work area
const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz ); const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz );
const Rectangle &rOldWork = GetDrawView()->GetWorkArea(); const Rectangle &rOldWork = GetDrawView()->GetWorkArea();
sal_Bool bCheckDrawObjs = sal_False; sal_Bool bCheckDrawObjs = sal_False;
@@ -311,13 +227,11 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
SdrObject *pObj = pPage->GetObj( nObj ); SdrObject *pObj = pPage->GetObj( nObj );
if( !pObj->ISA(SwVirtFlyDrawObj) ) if( !pObj->ISA(SwVirtFlyDrawObj) )
{ {
//Teilfix(26793): Objekte, die in Rahmen verankert sind, brauchen // Objects not anchored to the frame, do not need to be adjusted
//nicht angepasst werden.
const SwContact *pCont = (SwContact*)GetUserCall(pObj); const SwContact *pCont = (SwContact*)GetUserCall(pObj);
//JP - 16.3.00 Bug 73920: this function might be called by the // this function might be called by the InsertDocument, when
// InsertDocument, when a PageDesc-Attribute is // a PageDesc-Attribute is set on a node. Then the SdrObject
// set on a node. Then the SdrObject must not have // must not have an UserCall.
// an UserCall.
if( !pCont || !pCont->ISA(SwDrawContact) ) if( !pCont || !pCont->ISA(SwDrawContact) )
continue; continue;
@@ -329,7 +243,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
continue; continue;
} }
// OD 19.06.2003 #108784# - no move for drawing objects in header/footer // no move for drawing objects in header/footer
if ( pAnchor->FindFooterOrHeader() ) if ( pAnchor->FindFooterOrHeader() )
{ {
continue; continue;
@@ -346,7 +260,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( aSz.Width() || aSz.Height() ) if ( aSz.Width() || aSz.Height() )
pObj->Move( aSz ); pObj->Move( aSz );
//Notanker: Grosse Objekte nicht nach oben verschwinden lassen. // Don't let large objects dissappear to the top
aSz.Width() = aSz.Height() = 0; aSz.Width() = aSz.Height() = 0;
if ( aBound.Bottom() < aRect.Top() ) if ( aBound.Bottom() < aRect.Top() )
aSz.Width() = (aBound.Bottom() - aRect.Top()) - MINFLY; aSz.Width() = (aBound.Bottom() - aRect.Top()) - MINFLY;
@@ -359,6 +273,4 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */