[Libreoffice-commits] core.git: 3 commits - filter/source svx/source vcl/source

[Stephan Bergmann]

 filter/source/msfilter/escherex.cxx   |    1 -
 svx/source/dialog/srchdlg.cxx         |    8 --------
 vcl/source/glyphs/graphite_layout.cxx |    2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 3fd63b98d18dc9de8b37edced8ae74e4d70b929c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 14 08:25:48 2015 +0200

    loplugin:implicitboolconversion
    
    Change-Id: Ib9f2b44c16e43841d560ac18ff82efd54888b9d7

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index f1a0999..07d19cf 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -154,7 +154,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
         if (firstChar < mnMinCharPos || firstChar >= mnEndCharPos)
             continue;
         // handle reordered clusters. Presumes reordered glyphs have monotonic opposite char index until the cluster base.
-        bool isReordered = (nextBaseSlot && ((bRtl ^ (gr_slot_before(nextBaseSlot) < firstChar - mnSegCharOffset))
+        bool isReordered = (nextBaseSlot && ((bRtl != (gr_slot_before(nextBaseSlot) < firstChar - mnSegCharOffset))
                                              || gr_slot_before(nextBaseSlot) == firstChar - mnSegCharOffset));
         if (clusterStart >= 0 && !isReordered)      // we hit the base (end) of a reordered cluster
         {
commit 2c6a260b12bea4f7024ad39acf90d42cff3e173e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 11 17:51:52 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...ever since the code block's inception with
    8037c7164c747ea240b563af39a11f4f6bf037ef "#119860# fix bent connector's type
    lost when save .ppt file"
    
    Change-Id: I6afa201a83c588cc8b280a99cb75c2267b962efc

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index fa693fc..d3033b5 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2296,7 +2296,6 @@ bool EscherPropertyContainer::CreateConnectorProperties(
                                             rShapeType = ( sal_uInt16 )( ESCHER_ShpInst_BentConnector2 + nAdjCount);
                                             for ( sal_Int32 i = 0 ; i < nAdjCount; ++ i)
                                                 AddOpt( (sal_uInt16) ( ESCHER_Prop_adjustValue+i) , lcl_GetConnectorAdjustValue( aPoly, i ) );
-                                            bRetValue = true;
                                         }
                                         sal_Int32 nAngle=0;
                                         if (lcl_GetAngle(aPoly,rShapeFlags,nAngle ))
commit c2e546c5837943466f2addfafc0d8aedc4c8e041
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 11 17:43:36 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    The if block had been disabled ever since
    c7c85ab76a60be56ebc51657aa30fa84eb2ddf84 "INTEGRATION: CWS pbfinal01," but that
    has probably become irrelevant at least since
    b80e865d369b4d94f29ac6dcc27379d3c6e72ada "Convert find & replace dialog to .ui"
    introduced SvxSearchDialog::ShowOptionalControls_Impl (called a few lines above
    the original if block), which (using a slightly different logic to determine
    bDrawApp) shows/hides m_pRegExpBtn and m_pLayoutBtn anyway.
    
    Change-Id: Iaf2c1d8ef1b4e3155d7c4109f15be86d738ba074

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5c85a13..3dd2321 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -804,7 +804,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
 
     ShowOptionalControls_Impl();
 
-    bool bDraw = false;
     if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC )
     {
         m_pCalcGrid->Show();
@@ -864,7 +863,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
             m_pFormatBtn->Hide();
             m_pNoFormatBtn->Hide();
             m_pAttributeBtn->Hide();
-            bDraw = true;
         }
         else
         {
@@ -887,12 +885,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
         }
     }
 
-    if ( false && !bDraw ) //!!!!!
-    {
-        m_pRegExpBtn->Show();
-        m_pLayoutBtn->Show();
-    }
-
     // similarity search?
     if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 )
         m_pSimilarityBox->Check( pSearchItem->IsLevenshtein() );