[Libreoffice-commits] core.git: 2 commits - sd/source sw/source

[Michael Stahl]

 sd/source/ui/remotecontrol/WINNetworkService.cxx |    3 +++
 sw/source/core/bastyp/swregion.cxx               |    8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 288d12ba9733443c96f92c42da26edaabd831b66
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 23:43:00 2014 +0200

    warning C4245 signed/unsigned mismatch
    
    Change-Id: If6222d61a6c75996ce5c40b3eae7895982c49b4a

diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index dcd2eb3..1f57fe1 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -143,8 +143,9 @@ inline SwTwips CalcArea( const SwRect &rRect )
 // combine all adjacent rectangles
 void SwRegionRects::Compress( bool bFuzzy )
 {
-    for ( size_type i = 0; i < size(); ++i )
+    for (size_type i = 0; i < size(); )
     {
+        bool bRestart(false);
         for ( size_type j = i+1; j < size(); ++j )
         {
             // If one rectangle contains a second completely than the latter
@@ -158,7 +159,7 @@ void SwRegionRects::Compress( bool bFuzzy )
             {
                 (*this)[i] = (*this)[j];
                 erase( begin() + j );
-                i = -1;
+                bRestart = true;
                 break;
             }
             else
@@ -180,11 +181,12 @@ void SwRegionRects::Compress( bool bFuzzy )
                 {
                     (*this)[i] = aUnion;
                     erase( begin() + j );
-                    i = -1;
+                    bRestart = true;
                     break;
                 }
             }
         }
+        i = (bRestart) ? 0 : i+1;
     }
 }
 
commit d7e5ad0bb2ef455254261f2f30a13de6a948f1ed
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 23:38:13 2014 +0200

    warning C4189 local variable initialized but not referenced
    
    Change-Id: I6047e0fc10bb6de0009da40855a97df89904cb0c

diff --git a/sd/source/ui/remotecontrol/WINNetworkService.cxx b/sd/source/ui/remotecontrol/WINNetworkService.cxx
index 144b33a..8f6885e 100644
--- a/sd/source/ui/remotecontrol/WINNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/WINNetworkService.cxx
@@ -7,6 +7,9 @@ void sd::WINNetworkService::setup()
 {
     DNSServiceErrorType err = DNSServiceRegister(&client, 0, 0, NULL, kREG_TYPE, "local", NULL, 1599, 1, "", NULL, this );
 
+    if (kDNSServiceErr_NoError != err)
+        SAL_WARN("sdremote.wifi", "DNSServiceRegister failed: " << err);
+
     // Fail silently
 }