include/vcl/vclenum.hxx | 2 +- sc/source/ui/app/inputwin.cxx | 4 ++++ vcl/headless/svpgdi.cxx | 24 ++++++++---------------- vcl/quartz/salgdicommon.cxx | 1 - vcl/win/gdi/salgdi2.cxx | 3 --- 5 files changed, 13 insertions(+), 21 deletions(-)
New commits: commit e35f3b6a3357fc3832a9d68ed37ddb9b5320ef0a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Feb 5 14:03:44 2016 +0000 Resolves: tdf#97465 like scroll ignore wheel for sc input handler inputchanged Change-Id: Ide7fe1388ffe6f85a1f459037316d03193470d8a diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index e61945a..105ba1a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1526,6 +1526,10 @@ void ScTextWnd::Command( const CommandEvent& rCEvt ) { //don't call InputChanged for CommandEventId::Wheel } + else if ( nCommand == CommandEventId::Swipe ) + { + //don't call InputChanged for CommandEventId::Swipe + } else SC_MOD()->InputChanged( pEditView ); } commit 287bc1c66e44f6ec384987d14e8b49790d8f3261 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Feb 5 12:15:37 2016 +0000 mysterious OutDevSupport_B2DClip is unused since maybe... commit ead04f8f0b7f51bf281ce41d8d590df0ca14af38 Author: Philipp Lohmann [pl] <philipp.lohm...@sun.com> Date: Fri Dec 3 16:21:36 2010 +0100 vcl118: #i115905# improved clip region interface on SAL layer (part 1, windows implementation) Change-Id: Iaeb49b60f70a9f595b67c7eb307a2e90b58d7150 diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 3404d79..28a6888 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -81,7 +81,7 @@ enum FontHintStyle { HINT_NONE, HINT_SLIGHT, HINT_MEDIUM, HINT_FULL }; typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl -enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, OutDevSupport_B2DDraw }; +enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DDraw }; struct ItalicMatrix { diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index b0f8de8..5baa761 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1380,8 +1380,6 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const case OutDevSupport_TransparentRect: case OutDevSupport_B2DDraw: return true; - case OutDevSupport_B2DClip: //what's this one ? - return false; } return false; } diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 742f31c..eaf40de 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1891,7 +1891,6 @@ bool AquaSalGraphics::supportsOperation( OutDevSupportType eType ) const switch( eType ) { case OutDevSupport_TransparentRect: - case OutDevSupport_B2DClip: case OutDevSupport_B2DDraw: bRet = true; break; diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx index 6f0e5d4..a73724a 100644 --- a/vcl/win/gdi/salgdi2.cxx +++ b/vcl/win/gdi/salgdi2.cxx @@ -47,9 +47,6 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const case OutDevSupport_TransparentRect: bRet = mbVirDev || mbWindow; break; - case OutDevSupport_B2DClip: - bRet = true; - break; case OutDevSupport_B2DDraw: bRet = bAllowForTest; default: break; commit ebd684486903021f3bd1434474876667d4430c97 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Feb 5 12:11:16 2016 +0000 ok non-zeroed empty extents is legitimate after all Change-Id: Ida1e27322bad5d2d36ae4217bb84187a022ebadf diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 9c9de74..b0f8de8 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1271,21 +1271,15 @@ cairo_user_data_key_t* SvpSalGraphics::getDamageKey() void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, const basegfx::B2DRange& rExtents) const { - sal_Int32 nExtentsLeft; - sal_Int32 nExtentsTop; - sal_Int32 nExtentsRight; - sal_Int32 nExtentsBottom; - if (rExtents.isEmpty()) { - nExtentsLeft = 0; - nExtentsTop = 0; - nExtentsRight = 0; - nExtentsBottom = 0; - } else { - nExtentsLeft = rExtents.getMinX(); - nExtentsTop = rExtents.getMinY(); - nExtentsRight = rExtents.getMaxX(); - nExtentsBottom = rExtents.getMaxY(); + if (rExtents.isEmpty()) + { + //nothing changed, return early + cairo_destroy(cr); + return; } + + sal_Int32 nExtentsLeft(rExtents.getMinX()), nExtentsTop(rExtents.getMinY()); + sal_Int32 nExtentsRight(rExtents.getMaxX()), nExtentsBottom(rExtents.getMaxY()); sal_Int32 nWidth = cairo_image_surface_get_width(m_pSurface); sal_Int32 nHeight = cairo_image_surface_get_height(m_pSurface); nExtentsLeft = std::max<sal_Int32>(nExtentsLeft, 0);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits