summaryrefslogtreecommitdiff
path: root/sw/source/core/view/vdraw.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/view/vdraw.cxx')
-rw-r--r--sw/source/core/view/vdraw.cxx124
1 files changed, 11 insertions, 113 deletions
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 994841e6787f..17710c82ee78 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,11 +39,9 @@
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
-/// OD 29.08.2002 #102450#
-/// include <svx/svdoutl.hxx>
#include <svx/svdoutl.hxx>
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
#include <svx/fmglob.hxx>
#endif
@@ -61,123 +60,45 @@
#include <IDocumentDrawModelAccess.hxx>
-/*************************************************************************
-|*
-|* SwSaveHdl
-|*
-|* Ersterstellung MA 14. Feb. 95
-|* Letzte Aenderung MA 02. Jun. 98
-|*
-|*************************************************************************/
-//SwSaveHdl::SwSaveHdl( SwViewImp *pI ) :
-// pImp( pI ),
-// bXorVis( sal_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()
{
if ( HasDrawView() )
{
SET_CURR_SHELL( GetShell() );
if ( pSh->ISA(SwFEShell) )
- ((SwFEShell*)pSh)->HideChainMarker(); //Kann sich geaendert haben
- //bResetXorVisibility = GetDrawView()->IsShownXorVisible( GetShell()->GetOut());
- //GetDrawView()->HideShownXor( GetShell()->GetOut() );
+ ((SwFEShell*)pSh)->HideChainMarker();
}
}
-
-
void SwViewImp::EndAction()
{
if ( HasDrawView() )
{
SET_CURR_SHELL( GetShell() );
- //if ( bResetXorVisibility )
- // GetDrawView()->ShowShownXor( GetShell()->GetOut() );
if ( pSh->ISA(SwFEShell) )
- ((SwFEShell*)pSh)->SetChainMarker(); //Kann sich geaendert haben
+ ((SwFEShell*)pSh)->SetChainMarker(); // May have changed
}
}
-/*************************************************************************
-|*
-|* SwViewImp::LockPaint(), UnlockPaint()
-|*
-|* Ersterstellung MA 11. Jun. 96
-|* Letzte Aenderung MA 11. Jun. 96
-|*
-|*************************************************************************/
-
-
void SwViewImp::LockPaint()
{
if ( HasDrawView() )
{
- //HMHbShowHdlPaint = GetDrawView()->IsMarkHdlShown();
- //HMHif ( bShowHdlPaint )
- //HMH GetDrawView()->HideMarkHdl();
bResetHdlHiddenPaint = !GetDrawView()->areMarkHandlesHidden();
GetDrawView()->hideMarkHandles();
}
else
{
- //HMHbShowHdlPaint = sal_False;
bResetHdlHiddenPaint = sal_False;
}
}
-
-
void SwViewImp::UnlockPaint()
{
if ( bResetHdlHiddenPaint )
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,
SwPrintData const*const pPrintData,
const SwRect& ,
@@ -196,20 +117,17 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
pOutDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL |
DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
}
-
- // OD 29.08.2002 #102450#
// For correct handling of accessibility, high contrast, the page background
// color is set as the background color at the outliner of the draw view.
// Only necessary for the layers hell and heaven
Color aOldOutlinerBackgrdColor;
- // OD 09.12.2002 #103045# - set default horizontal text direction on
- // painting <hell> or <heaven>.
+ // set default horizontal text direction on painting <hell> or <heaven>.
EEHorizontalTextDirection aOldEEHoriTextDir = EE_HTEXTDIR_L2R;
const IDocumentDrawModelAccess* pIDDMA = GetShell()->getIDocumentDrawModelAccess();
if ( (_nLayerID == pIDDMA->GetHellId()) ||
(_nLayerID == pIDDMA->GetHeavenId()) )
{
- ASSERT( _pPageBackgrdColor,
+ OSL_ENSURE( _pPageBackgrdColor,
"incorrect usage of SwViewImp::PaintLayer: pPageBackgrdColor have to be set for painting layer <hell> or <heaven>");
if ( _pPageBackgrdColor )
{
@@ -235,9 +153,8 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
GetPageView()->DrawLayer(_nLayerID, pOutDev);
pOutDev->Pop();
- // OD 29.08.2002 #102450#
// reset background color of the outliner
- // OD 09.12.2002 #103045# - reset default horizontal text direction
+ // reset default horizontal text direction
if ( (_nLayerID == pIDDMA->GetHellId()) ||
(_nLayerID == pIDDMA->GetHeavenId()) )
{
@@ -249,14 +166,6 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
}
}
-/*************************************************************************
-|*
-|* SwViewImp::IsDragPossible()
-|*
-|* Ersterstellung MA 19. Jan. 93
-|* Letzte Aenderung MA 16. Jan. 95
-|*
-|*************************************************************************/
#define WIEDUWILLST 400
sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
@@ -288,15 +197,6 @@ sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
return aRect.IsInside( rPoint );
}
-/*************************************************************************
-|*
-|* SwViewImp::NotifySizeChg()
-|*
-|* Ersterstellung MA 23. Jun. 93
-|* Letzte Aenderung MA 05. Oct. 98
-|*
-|*************************************************************************/
-
void SwViewImp::NotifySizeChg( const Size &rNewSz )
{
if ( !HasDrawView() )
@@ -305,7 +205,6 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( GetPageView() )
GetPageView()->GetPage()->SetSize( rNewSz );
- //Begrenzung des Arbeitsbereiches.
const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz );
const Rectangle &rOldWork = GetDrawView()->GetWorkArea();
sal_Bool bCheckDrawObjs = sal_False;
@@ -318,7 +217,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( !bCheckDrawObjs )
return;
- ASSERT( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
+ OSL_ENSURE( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
SdrPage* pPage = pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
const sal_uLong nObjs = pPage->GetObjCount();
for( sal_uLong nObj = 0; nObj < nObjs; ++nObj )
@@ -326,8 +225,6 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
SdrObject *pObj = pPage->GetObj( nObj );
if( !pObj->ISA(SwVirtFlyDrawObj) )
{
- //Teilfix(26793): Objekte, die in Rahmen verankert sind, brauchen
- //nicht angepasst werden.
const SwContact *pCont = (SwContact*)GetUserCall(pObj);
//JP - 16.3.00 Bug 73920: this function might be called by the
// InsertDocument, when a PageDesc-Attribute is
@@ -344,7 +241,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
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() )
{
continue;
@@ -361,7 +258,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( aSz.Width() || aSz.Height() )
pObj->Move( aSz );
- //Notanker: Grosse Objekte nicht nach oben verschwinden lassen.
+ //Note anchor: Large objects can not disappear from the top.
aSz.Width() = aSz.Height() = 0;
if ( aBound.Bottom() < aRect.Top() )
aSz.Width() = (aBound.Bottom() - aRect.Top()) - MINFLY;
@@ -376,3 +273,4 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */