[Libreoffice-commits] core.git: 6 commits - cui/source hwpfilter/source rsc/source sc/source shell/source svtools/source

[Markus Mohrhard]

 cui/source/options/personalization.cxx                    |    4 +---
 hwpfilter/source/formula.cxx                              |    4 ++--
 rsc/source/prj/start.cxx                                  |    2 +-
 sc/source/ui/view/output2.cxx                             |    1 -
 shell/source/win32/shlxthandler/propsheets/propsheets.cxx |    2 +-
 svtools/source/control/tabbar.cxx                         |    1 -
 6 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 2c334494efd4ee52638435a9b55b1e4b33b04b54
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 18:53:33 2015 +0100

    unconditional break in while loop
    
    Change-Id: Ia5c28300ba6c299c7625e8b63a46327123ebb98e

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 1bf0132..ddea9fe 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -443,15 +443,13 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
 {
     SelectPersonaDialog aDialog( NULL );
 
-    while ( aDialog.Execute() == RET_OK )
+    if ( aDialog.Execute() == RET_OK )
     {
         OUString aPersonaSetting( aDialog.GetAppliedPersonaSetting() );
         if ( !aPersonaSetting.isEmpty() )
         {
             SetPersonaSettings( aPersonaSetting );
         }
-
-        break;
     }
 
     return 0;
commit 3d3e883b15ae688031ffbc9f0e709848e2d629ad
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 18:48:31 2015 +0100

    wrong length value for string length
    
    Change-Id: Ic8b41ec4bb6b46177b02f533b936ab678207f926

diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index af2da38..cfe243f 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -176,7 +176,7 @@ static bool CallRsc2( RscStrList * pInputList,
         }
         if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ),  "-fp=", 4 ) ||
             !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fo=", 4 ) ||
-            !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-presponse", 9 ) ||
+            !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-presponse", 10 ) ||
             !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-rc", 3 ) ||
             !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-+" ) ||
             !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-br" ) ||
commit 837fa475b25c3a104c64715d457e47a911d7ca34
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 18:46:34 2015 +0100

    variable is assigned the same value twice
    
    Change-Id: I4c6ac1fa0ab387f86d17ba72e110ea7855929160

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 47f28c2..2bb31dc 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -4559,7 +4559,6 @@ void ScOutputData::DrawEdit(bool bPixelToLogic)
                         aParam.mnPosY = nPosY;
                         aParam.mnInitPosX = nInitPosX;
                         aParam.mpPreviewFontSet = pPreviewFontSet;
-                        aParam.mpPreviewFontSet = pPreviewFontSet;
                         aParam.mpOldPattern = pOldPattern;
                         aParam.mpOldCondSet = pOldCondSet;
                         aParam.mpOldPreviewFontSet = pOldPreviewFontSet;
commit 9510877c006636fa35ac774193febae37e3e7e98
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 18:44:46 2015 +0100

    variable is assigned the same value twice
    
    Change-Id: I8295b106352d449a3163ea56113a59525ac3eaf4

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index f53b326..b098471 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -414,7 +414,6 @@ void TabBar::ImplInit( WinBits nWinStyle )
     mbSelColor      = false;
     mbSelTextColor  = false;
     mbMirrored      = false;
-    mbMirrored      = false;
     mbScrollAlwaysEnabled = false;
 
     if ( nWinStyle & WB_3DTAB )
commit d7318352667dc45794072c6a853a882544f02671
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 17:21:04 2015 +0100

    more efficient check for empty strings
    
    Change-Id: Ibc2f7412b6bf8ef75f93d649812836c01224e43f

diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index ba29996..c29cbee 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -625,7 +625,7 @@ int Formula::parse()
                      break;
           }
          // fprintf(stderr,"\n\n[RESULT]\n[%s]\n",a.c_str());
-          if( strlen(buf) > 0 )
+          if( buf[0] != '\0' )
                 res = mainParse( a.c_str() );
           else
                 res = 0L;
@@ -673,7 +673,7 @@ void Formula::trim()
           else
                 break;
      }
-     if( strlen(buf) > 0 )
+     if( buf[0] != '\0' )
           strcpy(eq, buf);
      else
           eq = 0L;
commit ff8b9c4e590ff6189b5d7446814a398ab513bd0c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Mar 1 17:14:35 2015 +0100

    unnecessary wstring -> char* -> wstring conversion
    
    Change-Id: I21e6036a5156ed62f2c7bff6439c64d0178c96e4

diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index bd136d1..0cfa944 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -323,7 +323,7 @@ void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
 
         // comments read from meta.xml use "\n" for return, but this will not displayable in Edit control, add
         // "\r" before "\n" to form "\r\n" in order to display return in Edit control.
-        std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION ).c_str();
+        std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION );
         std::wstring::size_type itor = tempStr.find ( L"\n" , 0 );
         while (itor != std::wstring::npos)
         {