diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-05-05 20:19:50 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-05-05 20:33:19 +0200 |
commit | b9008dfbef5c744e351c6bb1edbfc30f364731c8 (patch) | |
tree | 03767b2515c2ab7f7334882fce4cf5c6fbc9de14 | |
parent | c1d5e765dbc78de252cb94a66bb5ed49f15218ff (diff) |
fdo#62475 - remove visual noise in sw/source/core/view
- ASCII art
- method comments without further info
- multiple blank lines
Change-Id: Iec6fac8ce28a82b2ce15a72ed7ffa5fc38d4e218
-rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 11 | ||||
-rw-r--r-- | sw/source/core/view/printdata.cxx | 20 | ||||
-rw-r--r-- | sw/source/core/view/vdraw.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/view/viewimp.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/view/viewpg.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 50 | ||||
-rw-r--r-- | sw/source/core/view/vnew.cxx | 18 | ||||
-rw-r--r-- | sw/source/core/view/vprint.cxx | 48 |
8 files changed, 7 insertions, 158 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 3ba9196d197f..fca15fe51314 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -43,9 +43,8 @@ // Note: method defined in '/sw/source/core/layout/paintfrm.cxx' extern void SwCalcPixStatics( OutputDevice *pOut ); -// ============================================================================= // methods to initialize page preview layout -// ============================================================================= + SwPagePreviewLayout::SwPagePreviewLayout( ViewShell& _rParentViewShell, const SwRootFrm& _rLayoutRootFrm ) : mnXFree ( 4*142 ), @@ -284,9 +283,7 @@ bool SwPagePreviewLayout::ReInit() return true; } -// ============================================================================= // methods to prepare paint of page preview -// ============================================================================= /** prepare paint of page preview @@ -742,10 +739,8 @@ bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview, return bRet; } -// ============================================================================= // methods to determine new data for changing the current shown part of the // document preview. -// ============================================================================= /** calculate start position for new scale @@ -1011,9 +1006,7 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( return nScrollAmount; } -// ============================================================================= // methods to paint page preview layout -// ============================================================================= /** paint prepared preview @@ -1331,9 +1324,7 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) _PaintSelectMarkAtPage( pNewSelectedPrevwPage ); } -// ============================================================================= // helper methods -// ============================================================================= /** get preview page by physical page number diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index b775fc094536..f4e533d958c6 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <printdata.hxx> #include <globals.hrc> @@ -34,27 +33,22 @@ #include <unotools/moduleoptions.hxx> #include <vcl/outdev.hxx> - extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); - using namespace ::com::sun::star; - -////////////////////////////////////////////////////////////////////// +// SwRenderData SwRenderData::SwRenderData() { } - SwRenderData::~SwRenderData() { OSL_ENSURE( !m_pPostItShell, "m_pPostItShell should already have been deleted" ); OSL_ENSURE( !m_pPostItFields, " should already have been deleted" ); } - void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ) { DeletePostItData(); @@ -70,7 +64,6 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, m_pPostItShell.reset(new ViewShell(*new SwDoc, 0, &aViewOpt, pOutDev)); } - void SwRenderData::DeletePostItData() { if (HasPostItData()) @@ -86,6 +79,7 @@ SfxObjectShellLock const& SwRenderData::GetTempDocShell() const { return m_xTempDocShell; } + void SwRenderData::SetTempDocShell(SfxObjectShellLock const& xShell) { m_xTempDocShell = xShell; @@ -96,7 +90,6 @@ bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell& rCompare ) const return m_pViewOptionAdjust ? ! m_pViewOptionAdjust->checkShell( rCompare ) : true; } - void SwRenderData::ViewOptionAdjustStart( ViewShell &rSh, const SwViewOption &rViewOptions) { @@ -108,13 +101,11 @@ void SwRenderData::ViewOptionAdjustStart( new SwViewOptionAdjust_Impl( rSh, rViewOptions )); } - void SwRenderData::ViewOptionAdjust(SwPrintData const*const pPrtOptions) { m_pViewOptionAdjust->AdjustViewOptions( pPrtOptions ); } - void SwRenderData::ViewOptionAdjustStop() { m_pViewOptionAdjust.reset(); @@ -125,7 +116,6 @@ void SwRenderData::ViewOptionAdjustCrashPreventionKludge() m_pViewOptionAdjust->DontTouchThatViewShellItSmellsFunny(); } - void SwRenderData::MakeSwPrtOptions( SwDocShell const*const pDocShell, SwPrintUIOptions const*const pOpt, @@ -169,8 +159,7 @@ void SwRenderData::MakeSwPrtOptions( rOptions.SetRenderData( this ); } - -////////////////////////////////////////////////////////////////////// +// SwPrintUIOptions SwPrintUIOptions::SwPrintUIOptions( sal_uInt16 nCurrentPage, @@ -423,7 +412,6 @@ SwPrintUIOptions::SwPrintUIOptions( assert(nIdx == nNumProps); } - SwPrintUIOptions::~SwPrintUIOptions() { } @@ -516,6 +504,4 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea return bChanged; } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 58a31032ba24..9ede6c5a6cb1 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -42,7 +42,6 @@ #include <IDocumentDrawModelAccess.hxx> - void SwViewImp::StartAction() { if ( HasDrawView() ) @@ -53,7 +52,6 @@ void SwViewImp::StartAction() } } - void SwViewImp::EndAction() { if ( HasDrawView() ) @@ -64,7 +62,6 @@ void SwViewImp::EndAction() } } - void SwViewImp::LockPaint() { if ( HasDrawView() ) @@ -78,14 +75,12 @@ void SwViewImp::LockPaint() } } - void SwViewImp::UnlockPaint() { if ( bResetHdlHiddenPaint ) GetDrawView()->showMarkHandles(); } - void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, SwPrintData const*const pPrintData, const SwRect& aPaintRect, diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 7e1d664c26b5..8dcf216c1aca 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -107,7 +107,6 @@ SwViewImp::SwViewImp( ViewShell *pParent ) : bFirstPageInvalid = sal_True; } - SwViewImp::~SwViewImp() { delete pAccMap; @@ -127,13 +126,11 @@ SwViewImp::~SwViewImp() OSL_ENSURE( !pIdleAct,"Be idle for the rest of your life." ); } - void SwViewImp::DelRegion() { DELETEZ(pRegion); } - sal_Bool SwViewImp::AddPaintRect( const SwRect &rRect ) { if ( rRect.IsOver( pSh->VisArea() ) ) @@ -146,14 +143,12 @@ sal_Bool SwViewImp::AddPaintRect( const SwRect &rRect ) return sal_False; } - void SwViewImp::CheckWaitCrsr() { if ( pLayAct ) pLayAct->CheckWaitCrsr(); } - sal_Bool SwViewImp::IsCalcLayoutProgress() const { if ( pLayAct ) @@ -161,7 +156,6 @@ sal_Bool SwViewImp::IsCalcLayoutProgress() const return sal_False; } - sal_Bool SwViewImp::IsUpdateExpFlds() { if ( pLayAct && pLayAct->IsCalcLayout() ) @@ -172,8 +166,6 @@ sal_Bool SwViewImp::IsUpdateExpFlds() return sal_False; } - - void SwViewImp::SetFirstVisPage() { if ( pSh->mbDocSizeChgd && pSh->VisArea().Top() > pSh->GetLayout()->Frm().Height() ) @@ -210,7 +202,6 @@ void SwViewImp::SetFirstVisPage() bFirstPageInvalid = sal_False; } - void SwViewImp::MakeDrawView() { IDocumentDrawModelAccess* pIDDMA = GetShell()->getIDocumentDrawModelAccess(); @@ -257,7 +248,6 @@ void SwViewImp::MakeDrawView() } } - Color SwViewImp::GetRetoucheColor() const { Color aRet( COL_TRANSPARENT ); diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 96a83df5c6d2..5e2a0e18fc7b 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/uno/Sequence.hxx> #include <hintids.hxx> @@ -44,10 +43,8 @@ #include <IDocumentFieldsAccess.hxx> #include <IDocumentDeviceAccess.hxx> - using namespace ::com::sun::star; - SwPageFrm const* sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage); // vprint.cxx diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 9f4d56b74efc..b1ac5c30314c 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -101,7 +101,6 @@ void ViewShell::ToggleHeaderFooterEdit() GetWin()->Invalidate(); } -////////////////////////////////////////////////////////////////////////////// // #i72754# 2nd set of Pre/PostPaints // This time it uses the lock counter (mPrePostPaintRegions empty/non-empty) to allow only one activation // and deactivation and mpPrePostOutDev to remember the OutDev from the BeginDrawLayers @@ -180,9 +179,7 @@ void ViewShell::DLPostPaint2(bool bPaintFormLayer) mpTargetPaintWindow = 0; } } - -////////////////////////////////////////////////////////////////////////////// - +// end of Pre/PostPaints void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) { @@ -416,7 +413,6 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) ViewShell::mbLstAct = sal_False; Imp()->EndAction(); - //We artificially end the action here to enable the automatic scrollbars //to adjust themselves correctly //EndAction sends a Notify, and that must call Start-/EndAction to @@ -429,14 +425,12 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) Imp()->FireAccessibleEvents(); } - void ViewShell::ImplStartAction() { mbPaintWorks = sal_False; Imp()->StartAction(); } - void ViewShell::ImplLockPaint() { if ( GetWin() && GetWin()->IsVisible() ) @@ -444,7 +438,6 @@ void ViewShell::ImplLockPaint() Imp()->LockPaint(); } - void ViewShell::ImplUnlockPaint( sal_Bool bVirDev ) { SET_CURR_SHELL( this ); @@ -500,7 +493,6 @@ void ViewShell::ImplUnlockPaint( sal_Bool bVirDev ) Imp()->UnlockPaint(); } - sal_Bool ViewShell::AddPaintRect( const SwRect & rRect ) { sal_Bool bRet = sal_False; @@ -519,7 +511,6 @@ sal_Bool ViewShell::AddPaintRect( const SwRect & rRect ) return bRet; } - void ViewShell::InvalidateWindows( const SwRect &rRect ) { if ( !Imp()->IsCalcLayoutProgress() ) @@ -540,7 +531,6 @@ void ViewShell::InvalidateWindows( const SwRect &rRect ) } } - void ViewShell::MakeVisible( const SwRect &rRect ) { if ( !VisArea().IsInside( rRect ) || IsScrollMDI( this, rRect ) || GetCareWin(*this) ) @@ -571,7 +561,6 @@ void ViewShell::MakeVisible( const SwRect &rRect ) } } - Window* ViewShell::CareChildWin(ViewShell& rVSh) { if(rVSh.mpSfxViewShell) @@ -586,13 +575,11 @@ Window* ViewShell::CareChildWin(ViewShell& rVSh) return NULL; } - Point ViewShell::GetPagePos( sal_uInt16 nPageNum ) const { return GetLayout()->GetPagePos( nPageNum ); } - sal_uInt16 ViewShell::GetNumPages() { //It is possible that no layout exists when the method from @@ -656,7 +643,6 @@ sal_Bool ViewShell::HasCharts() const return bRet; } - void ViewShell::LayoutIdle() { #ifdef TCOVER @@ -701,7 +687,6 @@ void ViewShell::LayoutIdle() } } - static void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) { sal_Bool bCrsr = rSh.ISA(SwCrsrShell); @@ -836,7 +821,6 @@ void ViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing ) } } - /** * Sets IDocumentSettingAccess if former object positioning should be used. * #i11860# @@ -853,7 +837,6 @@ void ViewShell::SetUseFormerObjectPositioning( bool _bUseFormerObjPos ) } } - // #i28701# void ViewShell::SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ) { @@ -866,7 +849,6 @@ void ViewShell::SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ) } } - void ViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); @@ -879,7 +861,6 @@ void ViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping ) } } - // #i45491# void ViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak ) { @@ -893,7 +874,6 @@ void ViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWit } } - void ViewShell::Reformat() { SwWait aWait( *GetDoc()->GetDocShell(), sal_True ); @@ -973,7 +953,6 @@ void ViewShell::CalcLayout() ::EndProgress( GetDoc()->GetDocShell() ); } - void ViewShell::SetFirstVisPageInvalid() { ViewShell *pSh = this; @@ -986,7 +965,6 @@ void ViewShell::SetFirstVisPageInvalid() } while ( pSh != this ); } - void ViewShell::SizeChgNotify() { if ( !mpWin ) @@ -1015,7 +993,6 @@ void ViewShell::SizeChgNotify() } } - void ViewShell::VisPortChgd( const SwRect &rRect) { OSL_ENSURE( GetWin(), "VisPortChgd ohne Window." ); @@ -1183,10 +1160,8 @@ void ViewShell::VisPortChgd( const SwRect &rRect) if( Imp()->IsAccessible() ) Imp()->UpdateAccessible(); - } - sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect ) { #if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS) @@ -1420,7 +1395,6 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe return sal_False; } - void ViewShell::PaintDesktop( const SwRect &rRect ) { if ( !GetWin() && !GetOut()->GetConnectMetaFile() ) @@ -1502,7 +1476,6 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) _PaintDesktop( aRegion ); } - // PaintDesktop is split in two, this part is also used by PreViewPage void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) { @@ -1555,7 +1528,6 @@ void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) GetOut()->Pop(); } - sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect ) { if ( !GetWin() ) @@ -1657,7 +1629,6 @@ sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect ) return bRet; } - void ViewShell::Paint(const Rectangle &rRect) { if ( mnLockPaint ) @@ -1783,7 +1754,6 @@ void ViewShell::Paint(const Rectangle &rRect) } } - void ViewShell::SetBrowseBorder( const Size& rNew ) { if( rNew != maBrowseBorder ) @@ -1813,7 +1783,6 @@ sal_Int32 ViewShell::GetBrowseWidth() const return maVisArea.Width() - 2 * GetOut()->PixelToLogic(maBrowseBorder).Width(); } - void ViewShell::CheckBrowseView( sal_Bool bBrowseChgd ) { if ( !bBrowseChgd && !GetViewOptions()->getBrowseMode() ) @@ -1870,12 +1839,10 @@ void ViewShell::CheckBrowseView( sal_Bool bBrowseChgd ) UnlockPaint(); } - SwRootFrm *ViewShell::GetLayout() const { return mpLayout.get(); } -/***********************************************************************/ OutputDevice& ViewShell::GetRefDev() const { @@ -1897,12 +1864,10 @@ const SwNodes& ViewShell::GetNodes() const return mpDoc->GetNodes(); } - void ViewShell::DrawSelChanged() { } - Size ViewShell::GetDocSize() const { Size aSz; @@ -1913,13 +1878,11 @@ Size ViewShell::GetDocSize() const return aSz; } - SfxItemPool& ViewShell::GetAttrPool() { return GetDoc()->GetAttrPool(); } - void ViewShell::ApplyViewOptions( const SwViewOption &rOpt ) { @@ -2096,7 +2059,6 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) } - void ViewShell::SetUIOptions( const SwViewOption &rOpt ) { mpOpt->SetUIOptions(rOpt); @@ -2108,7 +2070,6 @@ void ViewShell::SetUIOptions( const SwViewOption &rOpt ) mpOpt->SetSymbolFont(rOpt.GetSymbolFont()); } - void ViewShell::SetReadonlyOption(sal_Bool bSet) { //JP 01.02.99: at readonly flag query properly @@ -2139,7 +2100,6 @@ void ViewShell::SetReadonlyOption(sal_Bool bSet) } } - void ViewShell::SetPDFExportOption(sal_Bool bSet) { if( bSet != mpOpt->IsPDFExport() ) @@ -2150,7 +2110,6 @@ void ViewShell::SetPDFExportOption(sal_Bool bSet) } } - void ViewShell::SetReadonlySelectionOption(sal_Bool bSet) { if( bSet != mpOpt->IsSelectionInReadonly() ) @@ -2159,13 +2118,11 @@ void ViewShell::SetReadonlySelectionOption(sal_Bool bSet) } } - void ViewShell::SetPrtFormatOption( sal_Bool bSet ) { mpOpt->SetPrtFormat( bSet ); } - void ViewShell::UISizeNotify() { if ( mbDocSizeChgd ) @@ -2178,7 +2135,6 @@ void ViewShell::UISizeNotify() } } - void ViewShell::SetRestoreActions(sal_uInt16 nSet) { OSL_ENSURE(!GetRestoreActions()||!nSet, "multiple restore of the Actions ?"); @@ -2279,7 +2235,6 @@ SwAccessibleMap* ViewShell::GetAccessibleMap() return 0; } - void ViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) { if(mpOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews()) @@ -2335,7 +2290,6 @@ const Size ViewShell::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) c return aSize; } - // #i12836# enhanced pdf export sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const { @@ -2366,7 +2320,6 @@ sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwR return nRet; } - // --> PB 2007-05-30 #146850# const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState ) { @@ -2434,6 +2387,7 @@ const IDocumentListItems* ViewShell::getIDocumentListItemsAccess() const { return mpDoc; } + const IDocumentOutlineNodes* ViewShell::getIDocumentOutlineNodesAccess() const { return mpDoc; diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 62bbee6cdcfe..a8b293e2a6a3 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -37,15 +37,6 @@ #include <accessibilityoptions.hxx> #include <switerator.hxx> - -/************************************************************************* -|* -|* ViewShell::Init() -|* -|* Letzte Aenderung MA 14. Jun. 96 -|* -|*************************************************************************/ - void ViewShell::Init( const SwViewOption *pNewOpt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::Init" ); @@ -313,15 +304,6 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, } -/****************************************************************************** -|* -|* ViewShell::~ViewShell() -|* -|* Ersterstellung MA ?? -|* Letzte Aenderung MA 10. May. 95 -|* -******************************************************************************/ - ViewShell::~ViewShell() { { diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 5d2d841df893..809a7a7d6463 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -70,10 +70,8 @@ #include <fmtpdsc.hxx> // SwFmtPageDesc #include <globals.hrc> - using namespace ::com::sun::star; -//-------------------------------------------------------------------- /// Painting buffer class SwQueuedPaint { @@ -102,7 +100,6 @@ public: ~SwDrawViewSave(); }; - void SwPaintQueue::Add( ViewShell *pNew, const SwRect &rNew ) { SwQueuedPaint *pPt; @@ -123,8 +120,6 @@ void SwPaintQueue::Add( ViewShell *pNew, const SwRect &rNew ) pQueue = pNQ; } - - void SwPaintQueue::Repaint() { if ( !SwRootFrm::IsInPaint() && pQueue ) @@ -155,8 +150,6 @@ void SwPaintQueue::Repaint() } } - - void SwPaintQueue::Remove( ViewShell *pSh ) { SwQueuedPaint *pPt; @@ -179,13 +172,6 @@ void SwPaintQueue::Remove( ViewShell *pSh ) } } -/****************************************************************************** - * Methode : void SetSwVisArea( ViewShell *pSh, Point aPrtOffset, ... - * Beschreibung: - * Erstellt : OK 04.11.94 16:27 - * Aenderung : - ******************************************************************************/ - void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool /*bPDFExport*/ ) { OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" ); @@ -206,8 +192,6 @@ void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool /*bPDFExport*/ pOut->SetMapMode( aMapMode ); } -/******************************************************************************/ - void ViewShell::InitPrt( OutputDevice *pOutDev ) { // For printing we use a negative offset (exactly the offset of OutputSize). @@ -231,13 +215,6 @@ void ViewShell::InitPrt( OutputDevice *pOutDev ) mpOut = pOutDev; } -/****************************************************************************** - * Methode : void ViewShell::ChgAllPageOrientation - * Erstellt : MA 08. Aug. 95 - * Aenderung : - ******************************************************************************/ - - void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri ) { OSL_ENSURE( mnStartAction, "missing an Action" ); @@ -277,13 +254,6 @@ void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri ) } } -/****************************************************************************** - * Methode : void ViewShell::ChgAllPageOrientation - * Erstellt : MA 08. Aug. 95 - * Aenderung : - ******************************************************************************/ - - void ViewShell::ChgAllPageSize( Size &rSz ) { OSL_ENSURE( mnStartAction, "missing an Action" ); @@ -318,7 +288,6 @@ void ViewShell::ChgAllPageSize( Size &rSz ) } } - void ViewShell::CalcPagesForPrint( sal_uInt16 nMax ) { SET_CURR_SHELL( this ); @@ -351,8 +320,6 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax ) pMyLayout->EndAllAction(); } -/******************************************************************************/ - SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) { OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only"); @@ -485,9 +452,7 @@ sal_Bool ViewShell::PrintOrPDFExport( SwPrintData const& rPrintData, sal_Int32 nRenderer /* the index in the vector of pages to be printed */ ) { -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// CAUTION: Do also always update the printing routines in viewpg.cxx (PrintProspect)! -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // CAUTION: Do also always update the printing routines in viewpg.cxx (PrintProspect)! const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagesToPrint().size() - 1; OSL_ENSURE( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of bounds"); @@ -558,7 +523,6 @@ sal_Bool ViewShell::PrintOrPDFExport( pOutDev->SetMapMode( aTmp ); } #endif - pShell->InitPrt( pOutDev ); ::SetSwVisArea( pViewSh2, pStPage->Frm() ); @@ -577,15 +541,6 @@ sal_Bool ViewShell::PrintOrPDFExport( return sal_True; } -/****************************************************************************** - * Methode : PrtOle2() - * Beschreibung: - * Erstellt : PK 07.12.94 - * Aenderung : MA 16. Feb. 95 - ******************************************************************************/ - - - void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ) { @@ -668,7 +623,6 @@ SwDrawViewSave::~SwDrawViewSave() } } - // OD 09.01.2003 #i6467# - method also called for page preview void ViewShell::PrepareForPrint( const SwPrintData &rOptions ) { |