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

work on comments in sw/source/core/view

Browse Source 
Change-Id: I3934487475df1da7fe6cf68656c4c38881d1a394
This commit is contained in:
Philipp Riemer
2013-05-05 20:15:21 +02:00
parent 66e47a5cfd
commit c1d5e765db
5 changed files with 25 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
sw/source/core/view/pagepreviewlayout.cxx
View File

@@ -122,8 +122,6 @@ void SwPagePreviewLayout::_ClearPrevwPageData()
/** calculate page preview layout sizes /** calculate page preview layout sizes
OD 18.12.2002 #103492# OD 18.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::_CalcPrevwLayoutSizes() void SwPagePreviewLayout::_CalcPrevwLayoutSizes()
{ {
@@ -176,12 +174,11 @@ void SwPagePreviewLayout::_CalcPrevwLayoutSizes()
OD 11.12.2002 #103492# OD 11.12.2002 #103492#
initialize the page preview settings for a given layout. initialize the page preview settings for a given layout.
side effects: side effects:
(1) If parameter <_bCalcScale> is true, mapping mode with calculated (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 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. the given view shell is set with the calculated scaling.
@author OD
*/ */
bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols,
const sal_uInt16 _nRows, const sal_uInt16 _nRows,
@@ -252,12 +249,7 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols,
return true; return true;
} }
/** apply new zoom at given view shell /** apply new zoom at given view shell */
OD 11.12.2002 #103492# - implementation of <_ApplyNewZoomAtViewShell>
@author OD
*/
void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom )
{ {
SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions()); SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions());
@@ -274,8 +266,6 @@ void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom )
/** method to adjust page preview layout to document changes /** method to adjust page preview layout to document changes
OD 18.12.2002 #103492# OD 18.12.2002 #103492#
@author OD
*/ */
bool SwPagePreviewLayout::ReInit() bool SwPagePreviewLayout::ReInit()
{ {
@@ -297,12 +287,13 @@ bool SwPagePreviewLayout::ReInit()
// ============================================================================= // =============================================================================
// methods to prepare paint of page preview // methods to prepare paint of page preview
// ============================================================================= // =============================================================================
/** prepare paint of page preview /** prepare paint of page preview
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
OD 21.03.2003 #108282# - delete parameter _onStartPageVirtNum 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, bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
const Point _aProposedStartPos, const Point _aProposedStartPos,
@@ -502,8 +493,6 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
/** calculate additional paint offset /** calculate additional paint offset
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::_CalcAdditionalPaintOffset() void SwPagePreviewLayout::_CalcAdditionalPaintOffset()
{ {
@@ -535,8 +524,6 @@ void SwPagePreviewLayout::_CalcAdditionalPaintOffset()
/** calculate painted preview document rectangle /** calculate painted preview document rectangle
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::_CalcDocPrevwPaintRect() void SwPagePreviewLayout::_CalcDocPrevwPaintRect()
{ {
@@ -564,8 +551,6 @@ void SwPagePreviewLayout::_CalcDocPrevwPaintRect()
/** calculate preview pages /** calculate preview pages
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::_CalcPreviewPages() void SwPagePreviewLayout::_CalcPreviewPages()
{ {
@@ -681,8 +666,6 @@ void SwPagePreviewLayout::_CalcPreviewPages()
/** determines preview data for a given page and a given preview offset /** determines preview data for a given page and a given preview offset
OD 13.12.2002 #103492# OD 13.12.2002 #103492#
@author OD
*/ */
bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage, bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage,
const Point& _rPrevwOffset, const Point& _rPrevwOffset,
@@ -725,8 +708,6 @@ bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage,
/** enable/disable book preview /** enable/disable book preview
OD 2004-03-04 #i18143# OD 2004-03-04 #i18143#
@author OD
*/ */
bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview, bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview,
sal_uInt16& _onStartPageNum, 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 // methods to determine new data for changing the current shown part of the
// document preview. // document preview.
// ============================================================================= // =============================================================================
/** calculate start position for new scale /** calculate start position for new scale
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
@author OD
*/ */
Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( Point SwPagePreviewLayout::GetPreviewStartPosForNewScale(
const Fraction& _aNewScale, const Fraction& _aNewScale,
@@ -830,7 +810,7 @@ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale(
/** determines, if page with given page number is visible in preview /** 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 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. /** 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( bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
const sal_Int16 _nHoriMove, const sal_Int16 _nHoriMove,
@@ -934,10 +914,7 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
return true; return true;
} }
/** checks, if given position is inside a shown document page /** checks, if given position is inside a shown document page */
@author OD
*/
struct PrevwPosInsidePagePred struct PrevwPosInsidePagePred
{ {
const Point mnPrevwPos; const Point mnPrevwPos;
@@ -996,10 +973,7 @@ bool SwPagePreviewLayout::IsPrevwPosInDocPrevwPage( const Point _aPrevwPos,
return bIsPosInsideDoc; return bIsPosInsideDoc;
} }
/** determine window page scroll amount /** determine window page scroll amount */
@author OD
*/
SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
const sal_Int16 _nWinPagesToScroll ) const const sal_Int16 _nWinPagesToScroll ) const
{ {
@@ -1040,11 +1014,10 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
// ============================================================================= // =============================================================================
// methods to paint page preview layout // methods to paint page preview layout
// ============================================================================= // =============================================================================
/** paint prepared preview /** paint prepared preview
OD 12.12.2002 #103492# OD 12.12.2002 #103492#
@author OD
*/ */
bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
{ {
@@ -1209,8 +1182,6 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
/** repaint pages on page preview /** repaint pages on page preview
OD 18.12.2002 #103492# OD 18.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const
{ {
@@ -1260,8 +1231,6 @@ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const
/** paint selection mark at page /** paint selection mark at page
OD 17.12.2002 #103492# OD 17.12.2002 #103492#
@author OD
*/ */
void SwPagePreviewLayout::_PaintSelectMarkAtPage( void SwPagePreviewLayout::_PaintSelectMarkAtPage(
const PrevwPage* _aSelectedPrevwPage ) const const PrevwPage* _aSelectedPrevwPage ) const
@@ -1321,7 +1290,7 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage(
Perform paint for current selected page in order to unmark it. Perform paint for current selected page in order to unmark it.
Set new selected page and perform paint to mark this page. 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 ) void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage )
{ {
@@ -1362,15 +1331,13 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage )
_PaintSelectMarkAtPage( pNewSelectedPrevwPage ); _PaintSelectMarkAtPage( pNewSelectedPrevwPage );
} }
// ============================================================================= // =============================================================================
// helper methods // helper methods
// ============================================================================= // =============================================================================
/** get preview page by physical page number /** get preview page by physical page number
OD 17.12.2002 #103492# OD 17.12.2002 #103492#
@author OD
*/ */
struct EqualsPageNumPred struct EqualsPageNumPred
{ {
@@ -1398,7 +1365,7 @@ const PrevwPage* SwPagePreviewLayout::_GetPrevwPageByPageNum( const sal_uInt16 _
OD 17.01.2003 #103492# OD 17.01.2003 #103492#
@author OD, _nPageNum is relative @note _nPageNum is relative
*/ */
sal_uInt16 SwPagePreviewLayout::GetRowOfPage( sal_uInt16 _nPageNum ) const 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# OD 17.01.2003 #103492#
@author OD, _nPageNum is relative @note _nPageNum is relative
*/ */
sal_uInt16 SwPagePreviewLayout::GetColOfPage( sal_uInt16 _nPageNum ) const 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 /** get size of a preview page by its physical page number
OD 15.01.2003 #103492# OD 15.01.2003 #103492#
@author OD
*/ */
Size SwPagePreviewLayout::GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) const 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 /** get virtual page number by its physical page number
OD 21.03.2003 #108282# OD 21.03.2003 #108282#
@author OD
*/ */
sal_uInt16 SwPagePreviewLayout::GetVirtPageNumByPageNum( sal_uInt16 _nPageNum ) const 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) /** Convert absolute to relative page numbers (see PrintEmptyPages) */
@author FME
*/
sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nAbsPageNum ) const sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nAbsPageNum ) const
{ {
if ( mbBookPreview || mbPrintEmptyPages || !_nAbsPageNum ) if ( mbBookPreview || mbPrintEmptyPages || !_nAbsPageNum )
@@ -1512,10 +1472,7 @@ sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nA
return nRet; return nRet;
} }
/** Convert relative to absolute page numbers (see PrintEmptyPages) /** Convert relative to absolute page numbers (see PrintEmptyPages) */
@author FME
*/
sal_uInt16 SwPagePreviewLayout::ConvertRelativeToAbsolutePageNum( sal_uInt16 _nRelPageNum ) const sal_uInt16 SwPagePreviewLayout::ConvertRelativeToAbsolutePageNum( sal_uInt16 _nRelPageNum ) const
{ {
if ( mbBookPreview || mbPrintEmptyPages || !_nRelPageNum ) if ( mbBookPreview || mbPrintEmptyPages || !_nRelPageNum )

8
sw/source/core/view/viewimp.cxx
View File

@@ -87,7 +87,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pDrawView->SetMarkHdlSizePixel(9); pDrawView->SetMarkHdlSizePixel(9);
} }
// SwViewImp::SwViewImp() CTor for the core internals /// CTor for the core internals
SwViewImp::SwViewImp( ViewShell *pParent ) : SwViewImp::SwViewImp( ViewShell *pParent ) :
pSh( pParent ), pSh( pParent ),
pDrawView( 0 ), pDrawView( 0 ),
@@ -379,7 +379,7 @@ void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
} while ( pTmp != pVSh ); } 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, void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
const SwTxtFrm* _pToTxtFrm ) const SwTxtFrm* _pToTxtFrm )
{ {
@@ -410,7 +410,7 @@ void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxt
} while ( pTmp != pVSh ); } while ( pTmp != pVSh );
} }
// invalidate text selection for paragraphs /// invalidate text selection for paragraphs
void SwViewImp::_InvalidateAccessibleParaTextSelection() void SwViewImp::_InvalidateAccessibleParaTextSelection()
{ {
ViewShell* pVSh = GetShell(); ViewShell* pVSh = GetShell();
@@ -426,7 +426,7 @@ void SwViewImp::_InvalidateAccessibleParaTextSelection()
} while ( pTmp != pVSh ); } while ( pTmp != pVSh );
} }
// invalidate attributes for paragraphs /// invalidate attributes for paragraphs
void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
{ {
ViewShell* pVSh = GetShell(); ViewShell* pVSh = GetShell();

2
sw/source/core/view/viewpg.cxx
View File

@@ -79,7 +79,7 @@ void ViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions)
return; return;
} }
// print brochure /// print brochure
// OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling // OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling
// for a page to be printed. // for a page to be printed.
void ViewShell::PrintProspect( void ViewShell::PrintProspect(

8
sw/source/core/view/viewsh.cxx
View File

@@ -1171,14 +1171,12 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
} }
GetWin()->Update(); GetWin()->Update();
// --> OD 2010-02-11 #i88070# if ( pPostItMgr ) // #i88070#
if ( pPostItMgr )
{ {
pPostItMgr->Rescale(); pPostItMgr->Rescale();
pPostItMgr->CalcRects(); pPostItMgr->CalcRects();
pPostItMgr->LayoutPostIts(); pPostItMgr->LayoutPostIts();
} }
// <--
if ( !bScrolled && pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) if ( !bScrolled && pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
pPostItMgr->CorrectPositions(); pPostItMgr->CorrectPositions();
@@ -2237,7 +2235,7 @@ void ViewShell::InvalidateAccessibleFocus()
Imp()->GetAccessibleMap().InvalidateFocus(); Imp()->GetAccessibleMap().InvalidateFocus();
} }
/* /**
* invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138# * invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138#
*/ */
void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
@@ -2249,7 +2247,7 @@ void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtF
} }
} }
/* /**
* invalidate text selection for paragraphs #i27301# * invalidate text selection for paragraphs #i27301#
*/ */
void ViewShell::InvalidateAccessibleParaTextSelection() void ViewShell::InvalidateAccessibleParaTextSelection()

9
sw/source/core/view/vprint.cxx
View File

@@ -649,14 +649,7 @@ sal_Bool ViewShell::IsAnyFieldInDoc() const
return sal_False; return sal_False;
} }
/// Saves some settings at the draw view
/******************************************************************************
* SwDrawViewSave
*
* Saves some settings at the draw view
******************************************************************************/
SwDrawViewSave::SwDrawViewSave( SdrView* pSdrView ) SwDrawViewSave::SwDrawViewSave( SdrView* pSdrView )
: pDV( pSdrView ) : pDV( pSdrView )
{ {