vcl/source/gdi/regband.cxx | 16 ++++++++-------- vcl/source/window/window.cxx | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 7ad8e33c0f00af96ae5ee35fb360901803c3863b Author: Tor Lillqvist <t...@collabora.com> Date: Tue Mar 11 08:16:33 2014 +0200 Spelling Change-Id: I7e55e51f63c3d8b1c778593a08ece7bc122b2765 diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 1184c0d..187d3a3 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -340,7 +340,7 @@ void ImplRegionBand::ScaleX( double fHorzScale ) -// combine overlaping sparations +// combine overlapping sparations bool ImplRegionBand::OptimizeBand() { @@ -361,7 +361,7 @@ bool ImplRegionBand::OptimizeBand() continue; } - // overlaping separations? -> combine! + // overlapping separations? -> combine! if ( pSep->mpNextSep ) { if ( (pSep->mnXRight+1) >= pSep->mpNextSep->mnXLeft ) @@ -426,11 +426,11 @@ void ImplRegionBand::Union( long nXLeft, long nXRight ) break; } - // new separation overlaping from left? -> extend boundary + // new separation overlapping from left? -> extend boundary if ( (nXRight >= pSep->mnXLeft) && (nXLeft <= pSep->mnXLeft) ) pSep->mnXLeft = nXLeft; - // new separation overlaping from right? -> extend boundary + // new separation overlapping from right? -> extend boundary if ( (nXLeft <= pSep->mnXRight) && (nXRight > pSep->mnXRight) ) { pSep->mnXRight = nXRight; @@ -479,13 +479,13 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight ) // will be removed from the optimizer pSep->mbRemoved = true; - // new separation overlaping from left? -> reduce right boundary + // new separation overlapping from left? -> reduce right boundary if ( (nXLeft <= pSep->mnXLeft) && (nXRight <= pSep->mnXRight) && (nXRight >= pSep->mnXLeft) ) pSep->mnXRight = nXRight; - // new separation overlaping from right? -> reduce right boundary + // new separation overlapping from right? -> reduce right boundary if ( (nXLeft >= pSep->mnXLeft) && (nXLeft <= pSep->mnXRight) && (nXRight >= pSep->mnXRight) ) @@ -533,7 +533,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) bSepProcessed = true; } - // new separation overlaping from left? -> reduce boundary + // new separation overlapping from left? -> reduce boundary if ( !bSepProcessed ) { if ( (nXRight >= pSep->mnXLeft) && (nXLeft <= pSep->mnXLeft) ) @@ -543,7 +543,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) } } - // new separation overlaping from right? -> reduce boundary + // new separation overlapping from right? -> reduce boundary if ( !bSepProcessed ) { if ( (nXLeft <= pSep->mnXRight) && (nXRight > pSep->mnXRight) ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index bb2e652..f5be436 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -235,8 +235,8 @@ WindowImpl::WindowImpl( WindowType nType ) mbNoParentUpdate = false; // true: SetParentUpdateMode( sal_False ) called mbActive = false; // true: Window Active mbParentActive = false; // true: OverlapActive from Parent - mbReallyVisible = false; // true: this and all parents to an overlaped window are visible - mbReallyShown = false; // true: this and all parents to an overlaped window are shown + mbReallyVisible = false; // true: this and all parents to an overlapped window are visible + mbReallyShown = false; // true: this and all parents to an overlapped window are shown mbInInitShow = false; // true: we are in InitShow mbChildNotify = false; // true: ChildNotify mbChildPtrOverwrite = false; // true: PointerStyle overwrites Child-Pointer _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits