[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source

[Markus Mohrhard]

 sd/source/ui/dlg/animobjs.cxx |    2 ++
 sd/source/ui/inc/animobjs.hxx |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6280261ad37f25219c3f232724790f012372a7ef
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sat Jan 10 16:27:14 2015 +0100

    fix Mac build
    
    Change-Id: Ie5a25da16753bd28df0514a831512e147de6a715
    Reviewed-on: https://gerrit.libreoffice.org/13848
    Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
    Tested-by: Norbert Thiebaud <nthieb...@gmail.com>

diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 111b37c..65bc8d8 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -127,6 +127,8 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt 
)
     }
 }
 
+size_t AnimationWindow::EMPTY_FRAMELIST = std::numeric_limits<size_t>::max();
+
 /**
  *  AnimationWindow - FloatingWindow
  */
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 0be13e4..18548d0 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -132,7 +132,7 @@ private:
 
     ::Window*       pWin;
     ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList;
-    static const size_t EMPTY_FRAMELIST = std::numeric_limits<size_t>::max();
+    static size_t EMPTY_FRAMELIST;
     size_t          m_nCurrentFrame;
     SdDrawDocument* pMyDoc;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits