[Libreoffice-commits] .: 2 commits - desktop/source slideshow/source

[Tor Lillqvist]

 desktop/source/pkgchk/unopkg/unopkg_app.cxx                       |    3 ++-
 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eeefce57c8a415c8bc5a4b044849d1e85ba20447
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Sep 29 21:54:00 2011 +0300

    Fix error: invalid conversion from 'long int*' to 'const GLint*'

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 346808b..d67355f 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -822,7 +822,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
 */
     // works but not mandatory
 #if defined(MAC_OS_X_VERSION_10_5)
-    long int swapInt = 1;
+    GLint swapInt = 1;
 #else /* build target 10.4 */ 
     long swapInt = 1;
 #endif
commit 50ce26da1431d4695af24827679799c7a20c507b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Sep 29 21:53:29 2011 +0300

    WaE: suggest a space before ';' or explicit braces around empty body in 'while' statement

diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 82af6dc..ec156d3 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -277,7 +277,8 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
             return 0;
         }
         //consume all bootstrap variables which may occur before the subcommannd
-        while(isBootstrapVariable(&nPos));
+        while(isBootstrapVariable(&nPos))
+            ;
 
         if(nPos >= nCount)
             return 0;