[Libreoffice-commits] .: sw/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Feb 7 00:57:32 PST 2011
sw/source/core/view/pagepreviewlayout.cxx | 20 ++++++--------------
sw/source/core/view/viewsh.cxx | 9 ++++-----
sw/source/core/view/vprint.cxx | 2 --
3 files changed, 10 insertions(+), 21 deletions(-)
New commits:
commit f37e6d71d012e1afa486419550dff14d309d1994
Author: Antoine Proulx <proulx.antoine at gmail.com>
Date: Sat Feb 5 17:11:34 2011 -0500
Remove bogus comments
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index ec64a9b..34e1675 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -254,7 +254,7 @@ void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom )
if ( aNewViewOptions.GetZoom() != _aNewZoom )
{
aNewViewOptions.SetZoom( _aNewZoom );
- // OD 24.09.2003 #i19975# - consider zoom type.
+ //#i19975# - consider zoom type.
enum SvxZoomType eZoomType = SVX_ZOOM_PERCENT;
aNewViewOptions.SetZoomType( eZoomType );
mrParentViewShell.ApplyViewOptions( aNewViewOptions );
@@ -750,8 +750,6 @@ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale(
/** determines, if page with given page number is visible in preview
- OD 12.12.2002 #103492#
-
@author OD, _nPageNum is absolut!
*/
bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const
@@ -762,8 +760,6 @@ bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const
/** calculate data to bring new selected page into view.
- OD 12.12.2002 #103492#
-
@author OD, IN/OUT parameters are absolute page numbers!!!
*/
bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
@@ -777,7 +773,7 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
sal_uInt16 nTmpRelSelPageNum = ConvertAbsoluteToRelativePageNum( mnSelectedPageNum );
sal_uInt16 nNewRelSelectedPageNum = nTmpRelSelPageNum;
- // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled
+ // leaving left-top-corner blank is controlled
// by <mbBookPreview>.
if ( mbBookPreview )
{
@@ -828,13 +824,13 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
sal_Int16 nTotalRows = GetRowOfPage( mnPages );
if ( (_nHoriMove > 0 || _nVertMove > 0) &&
mbDoesLayoutRowsFitIntoWindow &&
- mbDoesLayoutColsFitIntoWindow && // OD 20.02.2003 #107369# - add condition
+ mbDoesLayoutColsFitIntoWindow &&
nCurrRow > nTotalRows - mnRows )
{
// new proposed start page = left-top-corner of last possible
// preview page.
nNewStartPage = (nTotalRows - mnRows) * mnCols + 1;
- // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled
+ // leaving left-top-corner blank is controlled
// by <mbBookPreview>.
if ( mbBookPreview )
{
@@ -860,8 +856,6 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
/** checks, if given position is inside a shown document page
- OD 17.12.2002 #103492#
-
@author OD
*/
struct PrevwPosInsidePagePred
@@ -924,8 +918,6 @@ bool SwPagePreviewLayout::IsPrevwPosInDocPrevwPage( const Point _aPrevwPos,
/** determine window page scroll amount
- OD 17.12.2002 #103492#
-
@author OD
*/
SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
@@ -939,14 +931,14 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
else
nScrollAmount = _nWinPagesToScroll * maPaintedPrevwDocRect.GetHeight();
- // OD 19.02.2003 #107369# - check, if preview layout size values are valid.
+ // check, if preview layout size values are valid.
// If not, the checks for an adjustment of the scroll amount aren't useful.
if ( mbLayoutSizesValid )
{
if ( (maPaintedPrevwDocRect.Top() + nScrollAmount) <= 0 )
nScrollAmount = -maPaintedPrevwDocRect.Top();
- // OD 14.02.2003 #107369# - correct scroll amount
+ // correct scroll amount
if ( nScrollAmount > 0 &&
maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom()
)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 8ea4920..b4dc31e 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -330,7 +330,7 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
DLPostPaint2(true);
}
- // --> OD 2009-12-03 #i107365#
+ // #i107365#
// Direct paint has been performed. Thus, take care of
// transparent child windows.
if ( GetWin() )
@@ -359,7 +359,6 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
}
}
}
- // <--
}
delete pVout;
@@ -665,7 +664,7 @@ void lcl_InvalidateAllCntnt( ViewShell& rSh, BYTE nInv )
objects (Writer fly frame and drawing objects), which are anchored
to paragraph or to character.
- OD 2004-03-16 #i11860#
+ #i11860#
@author OD
*/
@@ -1664,7 +1663,7 @@ void ViewShell::Paint(const Rectangle &rRect)
return;
}
- //MA 30. Jul. 95: fix(16787): mit !nStartAction versuche ich mal mich gegen
+ // mit !nStartAction versuche ich mal mich gegen
//fehlerhaften Code an anderen Stellen zu wehren. Hoffentlich fuehrt das
//nicht zu Problemen!?
if ( bPaintWorks && !nStartAction )
@@ -2243,7 +2242,7 @@ void ViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibility
pAccOptions->SetStopAnimatedGraphics(! rAccessibilityOptions.GetIsAllowAnimatedGraphics());
pAccOptions->SetStopAnimatedText(! rAccessibilityOptions.GetIsAllowAnimatedText());
- // --> FME 2004-06-29 #114856# Formular view
+ // Formular view
// Always set this option, not only if document is read-only:
pOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly());
}
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index b37a383..b3c24b4 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -684,7 +684,6 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintDat
pDoc->GetRootFrm()->Lower()->InvalidateSize();
}
- // --> FME 2005-02-10 #119474#
// CalcPagesForPrint() should not be necessary here. The pages in the
// visible area will be formatted in SwRootFrm::Paint().
// Removing this gives us a performance gain during saving the
@@ -692,7 +691,6 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintDat
// formatting of the document.
// Seiten fuers Drucken formatieren
// pSh->CalcPagesForPrint( SHRT_MAX );
- // <--
pOleOut->Push( PUSH_CLIPREGION );
pOleOut->IntersectClipRegion( aSwRect.SVRect() );
pSh->GetLayout()->Paint( aSwRect );
More information about the Libreoffice-commits
mailing list