[Libreoffice-commits] .: 2 commits - pyuno/source sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Dec 25 00:55:52 PST 2012


 pyuno/source/module/pyuno_impl.hxx |    2 +-
 sd/source/ui/dlg/sdtreelb.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee6f9b5419af4e58354861ac775c207573989fc9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Dec 25 10:53:48 2012 +0200

    WaE: unreferenced local variable
    
    Change-Id: I3a1eff09724ec79ebc87360e37ccb412b7173a59

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 0fb7588..66b8002 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1414,7 +1414,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
                 return pViewShell.get();
         }
     }
-    catch (uno::Exception &e)
+    catch (uno::Exception &)
     {
         // When there is an exception then simply use the default value of
         // bIsEnabled and disable the controls.
commit 43df436f6098b429dd6918a66ab8fd9073ac1728
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Dec 25 10:51:28 2012 +0200

    WaE: Fix needed with MSVS 2010, too
    
    Change-Id: I1d1da64b14139c1d90ac07685f3fe88e99253815

diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 6231bad..446a286 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -19,7 +19,7 @@
 #ifndef _PYUNO_IMPL_
 #define _PYUNO_IMPL_
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1700)
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
 // Workaround for some horrible hypot() mess
 #include <math.h>
 #endif


More information about the Libreoffice-commits mailing list