sal/inc/sal/mathconf.h | 4 ++++ sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 1 + 2 files changed, 5 insertions(+)
New commits: commit e4b7f5d47ec26b9f96b612f13c87e2b80b281291 Author: Jürgen Schmidt <[email protected]> Date: Wed May 22 12:39:38 2013 +0000 fix isfinite error for gcc on MacOS diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h index f60d757..ae1ecb9 100644 --- a/sal/inc/sal/mathconf.h +++ b/sal/inc/sal/mathconf.h @@ -56,7 +56,11 @@ extern "C" { /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */ #if defined(__GNUC__) +#if defined(MACOSX) + #define SAL_MATH_FINITE(d) finite(d) +#else #define SAL_MATH_FINITE(d) __builtin_isfinite(d) // gcc bug 14608 +#endif #elif defined(__STDC__) // isfinite() should be available in math.h according to C99,C++99,SUSv3,etc. // unless GCC bug 14608 hits us where cmath undefines isfinite as macro commit a3d234a12b037327688d4743c82f76da732ec70e Author: Andre Fischer <[email protected]> Date: Wed May 22 12:22:32 2013 +0000 i122354: Fix notification of slide change when caused by slide sorter key event. diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index e0bf682..ea434b0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -446,6 +446,7 @@ void SelectionFunction::NotifyDragFinished (void) sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter); + PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter); PageSelector::UpdateLock aLock (mrSlideSorter); FocusManager& rFocusManager (mrController.GetFocusManager()); sal_Bool bResult = sal_False;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
