diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-05-05 20:15:21 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-05-05 20:33:18 +0200 |
commit | c1d5e765dbc78de252cb94a66bb5ed49f15218ff (patch) | |
tree | a3b9dbc4ac1e95b5435636e80c2781f848b0810e /sw | |
parent | 66e47a5cfd177571dc0811abda4e0a5a6ae8c56a (diff) |
work on comments in sw/source/core/view
Change-Id: I3934487475df1da7fe6cf68656c4c38881d1a394
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 75 | ||||
-rw-r--r-- | sw/source/core/view/viewimp.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/view/viewpg.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/view/vprint.cxx | 9 |
5 files changed, 25 insertions, 77 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index dab357dd5782..3ba9196d197f 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -122,8 +122,6 @@ void SwPagePreviewLayout::_ClearPrevwPageData() /** calculate page preview layout sizes OD 18.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::_CalcPrevwLayoutSizes() { @@ -176,12 +174,11 @@ void SwPagePreviewLayout::_CalcPrevwLayoutSizes() OD 11.12.2002 #103492# initialize the page preview settings for a given layout. + side effects: (1) If parameter <_bCalcScale> is true, mapping mode with calculated scaling is set at the output device and the zoom at the view options of the given view shell is set with the calculated scaling. - - @author OD */ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, const sal_uInt16 _nRows, @@ -252,12 +249,7 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, return true; } -/** apply new zoom at given view shell - - OD 11.12.2002 #103492# - implementation of <_ApplyNewZoomAtViewShell> - - @author OD -*/ +/** apply new zoom at given view shell */ void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) { SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions()); @@ -274,8 +266,6 @@ void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) /** method to adjust page preview layout to document changes OD 18.12.2002 #103492# - - @author OD */ bool SwPagePreviewLayout::ReInit() { @@ -297,12 +287,13 @@ bool SwPagePreviewLayout::ReInit() // ============================================================================= // methods to prepare paint of page preview // ============================================================================= + /** prepare paint of page preview OD 12.12.2002 #103492# OD 21.03.2003 #108282# - delete parameter _onStartPageVirtNum - @author OD, _nProposedStartPageNum, _onStartPageNum are absolute + @note _nProposedStartPageNum, _onStartPageNum are absolute */ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, const Point _aProposedStartPos, @@ -502,8 +493,6 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, /** calculate additional paint offset OD 12.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::_CalcAdditionalPaintOffset() { @@ -535,8 +524,6 @@ void SwPagePreviewLayout::_CalcAdditionalPaintOffset() /** calculate painted preview document rectangle OD 12.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::_CalcDocPrevwPaintRect() { @@ -564,8 +551,6 @@ void SwPagePreviewLayout::_CalcDocPrevwPaintRect() /** calculate preview pages OD 12.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::_CalcPreviewPages() { @@ -681,8 +666,6 @@ void SwPagePreviewLayout::_CalcPreviewPages() /** determines preview data for a given page and a given preview offset OD 13.12.2002 #103492# - - @author OD */ bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage, const Point& _rPrevwOffset, @@ -725,8 +708,6 @@ bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage, /** enable/disable book preview OD 2004-03-04 #i18143# - - @author OD */ bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview, sal_uInt16& _onStartPageNum, @@ -765,11 +746,10 @@ bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview, // methods to determine new data for changing the current shown part of the // document preview. // ============================================================================= + /** calculate start position for new scale OD 12.12.2002 #103492# - - @author OD */ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( const Fraction& _aNewScale, @@ -830,7 +810,7 @@ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( /** determines, if page with given page number is visible in preview - @author OD, _nPageNum is absolut! + @note _nPageNum is absolut! */ bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const { @@ -840,7 +820,7 @@ bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const /** calculate data to bring new selected page into view. - @author OD, IN/OUT parameters are absolute page numbers!!! + @note IN/OUT parameters are absolute page numbers!!! */ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove( const sal_Int16 _nHoriMove, @@ -934,10 +914,7 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove( return true; } -/** checks, if given position is inside a shown document page - - @author OD -*/ +/** checks, if given position is inside a shown document page */ struct PrevwPosInsidePagePred { const Point mnPrevwPos; @@ -996,10 +973,7 @@ bool SwPagePreviewLayout::IsPrevwPosInDocPrevwPage( const Point _aPrevwPos, return bIsPosInsideDoc; } -/** determine window page scroll amount - - @author OD -*/ +/** determine window page scroll amount */ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( const sal_Int16 _nWinPagesToScroll ) const { @@ -1040,11 +1014,10 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( // ============================================================================= // methods to paint page preview layout // ============================================================================= + /** paint prepared preview OD 12.12.2002 #103492# - - @author OD */ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const { @@ -1209,8 +1182,6 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const /** repaint pages on page preview OD 18.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const { @@ -1260,8 +1231,6 @@ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const /** paint selection mark at page OD 17.12.2002 #103492# - - @author OD */ void SwPagePreviewLayout::_PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const @@ -1321,7 +1290,7 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage( Perform paint for current selected page in order to unmark it. Set new selected page and perform paint to mark this page. - @author OD, _nSelectedPage, mnSelectedPage are absolut + @note _nSelectedPage, mnSelectedPage are absolut */ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) { @@ -1362,15 +1331,13 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) _PaintSelectMarkAtPage( pNewSelectedPrevwPage ); } - // ============================================================================= // helper methods // ============================================================================= + /** get preview page by physical page number OD 17.12.2002 #103492# - - @author OD */ struct EqualsPageNumPred { @@ -1398,7 +1365,7 @@ const PrevwPage* SwPagePreviewLayout::_GetPrevwPageByPageNum( const sal_uInt16 _ OD 17.01.2003 #103492# - @author OD, _nPageNum is relative + @note _nPageNum is relative */ sal_uInt16 SwPagePreviewLayout::GetRowOfPage( sal_uInt16 _nPageNum ) const { @@ -1422,7 +1389,7 @@ sal_uInt16 SwPagePreviewLayout::GetRowOfPage( sal_uInt16 _nPageNum ) const OD 17.01.2003 #103492# - @author OD, _nPageNum is relative + @note _nPageNum is relative */ sal_uInt16 SwPagePreviewLayout::GetColOfPage( sal_uInt16 _nPageNum ) const { @@ -1451,8 +1418,6 @@ Size SwPagePreviewLayout::GetPrevwDocSize() const /** get size of a preview page by its physical page number OD 15.01.2003 #103492# - - @author OD */ Size SwPagePreviewLayout::GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) const { @@ -1470,8 +1435,6 @@ Size SwPagePreviewLayout::GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) cons /** get virtual page number by its physical page number OD 21.03.2003 #108282# - - @author OD */ sal_uInt16 SwPagePreviewLayout::GetVirtPageNumByPageNum( sal_uInt16 _nPageNum ) const { @@ -1486,10 +1449,7 @@ sal_uInt16 SwPagePreviewLayout::GetVirtPageNumByPageNum( sal_uInt16 _nPageNum ) } } -/** Convert absolute to relative page numbers (see PrintEmptyPages) - - @author FME -*/ +/** Convert absolute to relative page numbers (see PrintEmptyPages) */ sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nAbsPageNum ) const { if ( mbBookPreview || mbPrintEmptyPages || !_nAbsPageNum ) @@ -1512,10 +1472,7 @@ sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nA return nRet; } -/** Convert relative to absolute page numbers (see PrintEmptyPages) - - @author FME -*/ +/** Convert relative to absolute page numbers (see PrintEmptyPages) */ sal_uInt16 SwPagePreviewLayout::ConvertRelativeToAbsolutePageNum( sal_uInt16 _nRelPageNum ) const { if ( mbBookPreview || mbPrintEmptyPages || !_nRelPageNum ) diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 8acd58107c4e..7e1d664c26b5 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -87,7 +87,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt ) pDrawView->SetMarkHdlSizePixel(9); } -// SwViewImp::SwViewImp() CTor for the core internals +/// CTor for the core internals SwViewImp::SwViewImp( ViewShell *pParent ) : pSh( pParent ), pDrawView( 0 ), @@ -379,7 +379,7 @@ void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster, } while ( pTmp != pVSh ); } -// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs +/// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, const SwTxtFrm* _pToTxtFrm ) { @@ -410,7 +410,7 @@ void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxt } while ( pTmp != pVSh ); } -// invalidate text selection for paragraphs +/// invalidate text selection for paragraphs void SwViewImp::_InvalidateAccessibleParaTextSelection() { ViewShell* pVSh = GetShell(); @@ -426,7 +426,7 @@ void SwViewImp::_InvalidateAccessibleParaTextSelection() } while ( pTmp != pVSh ); } -// invalidate attributes for paragraphs +/// invalidate attributes for paragraphs void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) { ViewShell* pVSh = GetShell(); diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 40065dd502fb..96a83df5c6d2 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -79,7 +79,7 @@ void ViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) return; } -// print brochure +/// print brochure // OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling // for a page to be printed. void ViewShell::PrintProspect( diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 1ade18f6fa8f..9f4d56b74efc 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1171,14 +1171,12 @@ void ViewShell::VisPortChgd( const SwRect &rRect) } GetWin()->Update(); - // --> OD 2010-02-11 #i88070# - if ( pPostItMgr ) + if ( pPostItMgr ) // #i88070# { pPostItMgr->Rescale(); pPostItMgr->CalcRects(); pPostItMgr->LayoutPostIts(); } - // <-- if ( !bScrolled && pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) pPostItMgr->CorrectPositions(); @@ -2237,7 +2235,7 @@ void ViewShell::InvalidateAccessibleFocus() Imp()->GetAccessibleMap().InvalidateFocus(); } -/* +/** * invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138# */ void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, @@ -2249,7 +2247,7 @@ void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtF } } -/* +/** * invalidate text selection for paragraphs #i27301# */ void ViewShell::InvalidateAccessibleParaTextSelection() diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 0371018411e2..5d2d841df893 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -649,14 +649,7 @@ sal_Bool ViewShell::IsAnyFieldInDoc() const return sal_False; } - - -/****************************************************************************** - * SwDrawViewSave - * - * Saves some settings at the draw view - ******************************************************************************/ - +/// Saves some settings at the draw view SwDrawViewSave::SwDrawViewSave( SdrView* pSdrView ) : pDV( pSdrView ) { |