[ooo-build-commit] .: 3 commits - cppcanvas/source svtools/source vcl/source

[Caolán McNamara]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |    3 +--
 svtools/source/uno/wizard/unowizard.cxx       |    2 +-
 vcl/source/helper/strhelper.cxx               |    8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 272d3dbe124efa7760ec35e9c2ceb749fc3c5564
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:17:22 2010 +0100

    #i113069# fix useless dereference

diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 9dfe9e7..cabc0a9 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -365,8 +365,8 @@ String WhitespaceToSpace( const String& rLine, BOOL bProtect )
             else
             {
                 *pLeap = *pRun;
-                *pLeap++;
-                *pRun++;
+                ++pLeap;
+                ++pRun;
             }
         }
     }
@@ -422,8 +422,8 @@ ByteString WhitespaceToSpace( const ByteString& rLine, BOOL bProtect )
             else
             {
                 *pLeap = *pRun;
-                *pLeap++;
-                *pRun++;
+                ++pLeap;
+                ++pRun;
             }
         }
     }
commit 9caf2020cdcdb98d879878930824935ba2f44aa3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:14:55 2010 +0100

    #i113054# WaE

diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 8b33854..8a3f310 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -414,7 +414,7 @@ namespace svt { namespace uno
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
-        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!" );
+        ENSURE_OR_RETURN( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!", Reference< XWizardPage >() );
 
         return pWizardImpl->getCurrentWizardPage();
     }
commit 34959eb39e3f32bd8a56575e948e411b6da45364
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 14:43:08 2010 +0100

    silence warning

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index fca5147..bb09cac 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1822,8 +1822,7 @@ namespace cppcanvas
                             static int count = -1, limit = 0x7fffffff;
                             if (count == -1) {
                                 count = 0;
-                                char *env;
-                                if (env = getenv ("EMF_PLUS_LIMIT")) {
+                                if (char *env = getenv ("EMF_PLUS_LIMIT")) {
                                     limit = atoi (env);
                                     EMFP_DEBUG (printf ("EMF+ records limit: %d\n", limit));
                                 }