Skip to content

C
core
Kaydet (Commit) ede5f05c authored tarafından Nick Savage's avatar Nick Savage Kaydeden (comit) Cédric Bosdonnat
Dosyalara gözat
Seçenekler

Comments cleanup in layout codeOF

üst c1369970
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 270 deletions
sw/source/core/view/printdata.cxx
Dosyayı görüntüle @ ede5f05c
......@@ -102,8 +102,8 @@ void SwRenderData::DeletePostItData()
{
if (HasPostItData())
{
m_pPostItDoc->setPrinter( 0, false, false ); //damit am echten DOC der Drucker bleibt
delete m_pPostItShell; //Nimmt das PostItDoc mit ins Grab.
m_pPostItDoc->setPrinter( 0, false, false ); // So that the printer remains at the real DOC
delete m_pPostItShell;
delete m_pPostItFields;
m_pPostItDoc = 0;
m_pPostItShell = 0;
......
sw/source/core/view/vdraw.cxx
Dosyayı görüntüle @ ede5f05c
......@@ -38,8 +38,6 @@
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
/// OD 29.08.2002 #102450#
/// include <svx/svdoutl.hxx>
#include <svx/svdoutl.hxx>
#ifdef DBG_UTIL
......@@ -61,123 +59,45 @@
#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()
{
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 = FALSE;
bResetHdlHiddenPaint = 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,
const SwPrtOptions * _pPrintData,
const SwRect& ,
......@@ -196,14 +116,11 @@ 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()) ||
......@@ -235,9 +152,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 +165,6 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
}
}
/*************************************************************************
|*
|* SwViewImp::IsDragPossible()
|*
|* Ersterstellung MA 19. Jan. 93
|* Letzte Aenderung MA 16. Jan. 95
|*
|*************************************************************************/
#define WIEDUWILLST 400
BOOL SwViewImp::IsDragPossible( const Point &rPoint )
......@@ -288,15 +196,6 @@ 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 +204,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();
BOOL bCheckDrawObjs = FALSE;
......@@ -326,8 +224,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 +240,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 +257,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;
......
sw/source/core/view/viewimp.cxx
Dosyayı görüntüle @ ede5f05c
......@@ -46,7 +46,6 @@
#include <svx/svdpage.hxx>
#include <accmap.hxx>
// OD 12.12.2002 #103492#
#include <pagepreviewlayout.hxx>
#include <comcore.hrc>
......@@ -56,19 +55,10 @@
#include <IDocumentDeviceAccess.hxx>
#include <IDocumentSettingAccess.hxx>
/*************************************************************************
|*
|* SwViewImp::Init()
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 03. Nov. 95
|*
|*************************************************************************/
void SwViewImp::Init( const SwViewOption *pNewOpt )
{
ASSERT( pDrawView, "SwViewImp::Init without DrawView" );
//Jetzt die PageView erzeugen wenn sie noch nicht existiert.
//Now create the page view if it does not exist.
SwRootFrm *pRoot = pSh->getIDocumentLayoutAccess()->GetRootFrm();
if ( !pSdrPageView )
{
......@@ -80,8 +70,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pRoot->GetDrawPage()->SetSize( pRoot->Frm().SSize() );
pSdrPageView = pDrawView->ShowSdrPage( pRoot->GetDrawPage());
// OD 26.06.2003 #108784# - notify drawing page view about invisible
// layers.
// notify drawing page view about invisible layers.
pIDDMA->NotifyInvisibleLayers( *pSdrPageView );
}
pDrawView->SetDragStripes( pNewOpt->IsCrossHair() );
......@@ -110,15 +99,6 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pDrawView->SetMarkHdlSizePixel(pNewOpt->IsBigMarkHdl() ? 9 : 7);
}
/*************************************************************************
|*
|* SwViewImp::SwViewImp() CTor fuer die Core-Internas
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 06. Sep. 96
|*
|*************************************************************************/
SwViewImp::SwViewImp( ViewShell *pParent ) :
pSh( pParent ),
pDrawView( 0 ),
......@@ -130,33 +110,19 @@ SwViewImp::SwViewImp( ViewShell *pParent ) :
pAccMap( 0 ),
pSdrObjCached(NULL),
nRestoreActions( 0 ),
// OD 12.12.2002 #103492#
mpPgPrevwLayout( 0 )
{
//bResetXorVisibility =
//HMHbShowHdlPaint =
bResetHdlHiddenPaint =
bSmoothUpdate = bStopSmooth = bStopPrt = FALSE;
bFirstPageInvalid = TRUE;
}
/******************************************************************************
|*
|* SwViewImp::~SwViewImp()
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 16. Dec. 94
|*
******************************************************************************/
SwViewImp::~SwViewImp()
{
delete pAccMap;
// OD 12.12.2002 #103492#
delete mpPgPrevwLayout;
//JP 29.03.96: nach ShowSdrPage muss auch HideSdrPage gemacht werden!!!
if( pDrawView )
pDrawView->HideSdrPage();
......@@ -168,29 +134,11 @@ SwViewImp::~SwViewImp()
ASSERT( !pIdleAct,"Be idle for the rest of your life." );
}
/******************************************************************************
|*
|* SwViewImp::DelRegions()
|*
|* Ersterstellung MA 14. Apr. 94
|* Letzte Aenderung MA 14. Apr. 94
|*
******************************************************************************/
void SwViewImp::DelRegion()
{
DELETEZ(pRegion);
}
/******************************************************************************
|*
|* SwViewImp::AddPaintRect()
|*
|* Ersterstellung MA ??
|* Letzte Aenderung MA 27. Jul. 94
|*
******************************************************************************/
BOOL SwViewImp::AddPaintRect( const SwRect &rRect )
{
if ( rRect.IsOver( pSh->VisArea() ) )
......@@ -203,31 +151,12 @@ BOOL SwViewImp::AddPaintRect( const SwRect &rRect )
return FALSE;
}
/******************************************************************************
|*
|* ViewImp::CheckWaitCrsr()
|*
|* Ersterstellung MA 10. Aug. 94
|* Letzte Aenderung MA 10. Aug. 94
|*
******************************************************************************/
void SwViewImp::CheckWaitCrsr()
{
if ( pLayAct )
pLayAct->CheckWaitCrsr();
}
/******************************************************************************
|*
|* ViewImp::IsCalcLayoutProgress()
|*
|* Ersterstellung MA 12. Aug. 94
|* Letzte Aenderung MA 12. Aug. 94
|*
******************************************************************************/
BOOL SwViewImp::IsCalcLayoutProgress() const
{
if ( pLayAct )
......@@ -235,15 +164,6 @@ BOOL SwViewImp::IsCalcLayoutProgress() const
return FALSE;
}
/******************************************************************************
|*
|* ViewImp::IsUpdateExpFlds()
|*
|* Ersterstellung MA 28. Mar. 96
|* Letzte Aenderung MA 28. Mar. 96
|*
******************************************************************************/
BOOL SwViewImp::IsUpdateExpFlds()
{
if ( pLayAct && pLayAct->IsCalcLayout() )
......@@ -254,24 +174,12 @@ BOOL SwViewImp::IsUpdateExpFlds()
return FALSE;
}
/******************************************************************************
|*
|* SwViewImp::SetFirstVisPage(), ImplGetFirstVisPage();
|*
|* Ersterstellung MA 21. Sep. 93
|* Letzte Aenderung MA 08. Mar. 94
|*
******************************************************************************/
void SwViewImp::SetFirstVisPage()
{
if ( pSh->bDocSizeChgd && pSh->VisArea().Top() > pSh->GetLayout()->Frm().Height() )
{
//Wir stecken in einer Action und die VisArea sitzt wegen
//Loeschoperationen hinter der erste sichtbaren Seite.
//Damit nicht zu heftig Formatiert wird, liefern wir die letzte Seite
//zurueck.
//We are in an "Action", and the VisArea is behind the first visible page due
//to delete operations. To prevent expensive formatting, return the last page
pFirstVisPage = (SwPageFrm*)pSh->GetLayout()->Lower();
while ( pFirstVisPage && pFirstVisPage->GetNext() )
pFirstVisPage = (SwPageFrm*)pFirstVisPage->GetNext();
......@@ -301,15 +209,6 @@ void SwViewImp::SetFirstVisPage()
bFirstPageInvalid = FALSE;
}
/******************************************************************************
|*
|* SwViewImp::MakeDrawView();
|*
|* Ersterstellung AMA 01. Nov. 95
|* Letzte Aenderung AMA 01. Nov. 95
|*
******************************************************************************/
void SwViewImp::MakeDrawView()
{
IDocumentDrawModelAccess* pIDDMA = GetShell()->getIDocumentDrawModelAccess();
......@@ -334,7 +233,6 @@ void SwViewImp::MakeDrawView()
if(!pOutDevForDrawView)
{
// pOutDevForDrawView = (OutputDevice*)GetShell()->getIDocumentDeviceAccess()->getPrinter( false );
pOutDevForDrawView = GetShell()->GetOut();
}
......@@ -345,8 +243,7 @@ void SwViewImp::MakeDrawView()
const SwViewOption* pSwViewOption = GetShell()->GetViewOptions();
Init(pSwViewOption);
// #i68597# If document is read-only, we will not profit from overlay,
// so switch it off.
// #i68597# If document is read-only, we will not profit from overlay, so switch it off.
if(pDrawView && pDrawView->IsBufferedOverlayAllowed())
{
bool bIsReadOnly(pSwViewOption->IsReadonly());
......@@ -368,15 +265,6 @@ void SwViewImp::MakeDrawView()
}
}
/******************************************************************************
|*
|* SwViewImp::GetRetoucheColor()
|*
|* Ersterstellung MA 24. Jun. 98
|* Letzte Aenderung MA 24. Jun. 98
|*
******************************************************************************/
Color SwViewImp::GetRetoucheColor() const
{
Color aRet( COL_TRANSPARENT );
......@@ -395,12 +283,6 @@ Color SwViewImp::GetRetoucheColor() const
return aRet;
}
/** create page preview layout
OD 12.12.2002 #103492#
@author OD
*/
void SwViewImp::InitPagePreviewLayout()
{
ASSERT( pSh->GetLayout(), "no layout - page preview layout can not be created.");
......@@ -503,12 +385,7 @@ void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
} while ( pTmp != pVSh );
}
/** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
OD 2005-12-01 #i27138#
@author OD
*/
// #i27138# invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
const SwTxtFrm* _pToTxtFrm )
{
......@@ -539,12 +416,7 @@ void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxt
} while ( pTmp != pVSh );
}
/** invalidate text selection for paragraphs
OD 2005-12-12 #i27301#
@author OD
*/
//#i27301# invalidate text selection for paragraphs
void SwViewImp::_InvalidateAccessibleParaTextSelection()
{
ViewShell* pVSh = GetShell();
......@@ -560,12 +432,7 @@ void SwViewImp::_InvalidateAccessibleParaTextSelection()
} while ( pTmp != pVSh );
}
/** invalidate attributes for paragraphs
OD 2009-01-06 #i88069#
@author OD
*/
//#i88069# invalidate attributes for paragraphs
void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
{
ViewShell* pVSh = GetShell();
......@@ -581,7 +448,6 @@ void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
} while ( pTmp != pVSh );
}
// OD 15.01.2003 #103492# - method signature change due to new page preview functionality
void SwViewImp::UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages,
const Fraction& _rScale,
const SwPageFrm* _pSelectedPageFrm,
......
sw/source/core/view/viewpg.cxx
Dosyayı görüntüle @ ede5f05c
......@@ -62,7 +62,6 @@
using namespace ::com::sun::star;
// OD 12.12.2002 #103492#
SwPagePreviewLayout* ViewShell::PagePreviewLayout()
{
return Imp()->PagePreviewLayout();
......@@ -73,10 +72,7 @@ void ViewShell::ShowPreViewSelection( sal_uInt16 nSelPage )
Imp()->InvalidateAccessiblePreViewSelection( nSelPage );
}
/** adjust view options for page preview
OD 09.01.2003 #i6467#
*/
//#i6467# adjust view options for page preview
void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions )
{
if ( !IsPreView() )
......@@ -91,9 +87,7 @@ void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions
}
// print brochure
// OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling
// for a page to be printed.
//#i14016# - consider empty pages on calculation of the scaling for a page to be printed.
void ViewShell::PrintProspect(
OutputDevice *pOutDev,
const SwPrintData &rPrintData,
......@@ -114,14 +108,12 @@ void ViewShell::PrintProspect(
std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
rPrintData.GetRenderData().GetPagePairsForProspectPrinting()[ nRenderer ];
// const USHORT nPageMax = static_cast< USHORT >(rPagesToPrint.first > rPagesToPrint.second ?
// rPagesToPrint.first : rPagesToPrint.second);
#if OSL_DEBUG_LEVEL > 1
DBG_ASSERT( rPagesToPrint.first == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.first ) == 1, "first Page not valid" );
DBG_ASSERT( rPagesToPrint.second == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.second ) == 1, "second Page not valid" );
#endif
// eine neue Shell fuer den Printer erzeugen
// create a new shell for the Printer
ViewShell aShell( *this, 0, pPrinter );
SET_CURR_SHELL( &aShell );
......@@ -151,8 +143,7 @@ void ViewShell::PrintProspect(
pNxtPage = aIt->second;
}
// OD 05.05.2003 #i14016# - consider empty pages on calculation
// of page size, used for calculation of scaling.
//#i14016# - consider empty pages on calculation of page size, used for calculation of scaling.
Size aSttPageSize;
if ( pStPage )
{
......@@ -200,7 +191,6 @@ void ViewShell::PrintProspect(
nMaxRowSz = Max( aNxtPageSize.Height(), aSttPageSize.Height() );
}
// den MapMode einstellen
aMapMode.SetOrigin( Point() );
{
Fraction aScX( aPrtSize.Width(), nMaxColSz );
......@@ -209,8 +199,6 @@ void ViewShell::PrintProspect(
aScY = aScX;
{
// fuer Drawing, damit diese ihre Objecte vernuenftig Painten
// koennen, auf "glatte" Prozentwerte setzen
aScY *= Fraction( 1000, 1 );
long nTmp = (long)aScY;
if( 1 < nTmp )
......
sw/source/core/view/viewsh.cxx
Dosyayı görüntüle @ ede5f05c
This diff is collapsed.
sw/source/core/view/vnew.cxx
Dosyayı görüntüle @ ede5f05c
This diff is collapsed.
sw/source/core/view/vprint.cxx
Dosyayı görüntüle @ ede5f05c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment