[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/source
László Németh
nemeth at collabora.com
Wed Dec 17 04:14:45 PST 2014
sd/source/ui/dlg/animobjs.cxx | 3 +++
sd/source/ui/inc/animobjs.hxx | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 0b39a164200bbb3dd146f1c79715604126ed7f6e
Author: László Németh <nemeth at collabora.com>
Date: Wed Dec 17 13:09:30 2014 +0100
fix Windows build
Change-Id: I0f5b4b1d5f5cf872555db77f07e68b2b980e3df1
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 96375d2..2003ca4 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -121,6 +121,9 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
/**
* AnimationWindow - FloatingWindow
*/
+
+const size_t AnimationWindow::EMPTY_FRAMELIST = std::numeric_limits<size_t>::max();
+
AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
SfxChildWindow *pCW, vcl::Window* pParent, const SdResId& rSdResId ) :
SfxDockingWindow ( pInBindings, pCW, pParent, rSdResId ),
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 44654b1..3afd1bf 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -125,7 +125,7 @@ private:
vcl::Window* pWin;
::std::vector< ::std::pair<BitmapEx*, ::tools::Time*> > m_FrameList;
- static const size_t EMPTY_FRAMELIST = std::numeric_limits<size_t>::max();
+ static const size_t EMPTY_FRAMELIST;
size_t m_nCurrentFrame;
SdDrawDocument* pMyDoc;
More information about the Libreoffice-commits
mailing list