commit 270e76f6eba44749743761c5575adf9f08e84675
author Mike Kaganski <mike.kaganski@collabora.com> Mon Nov 12 00:27:02 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Mon Nov 12 06:13:26 2018 +0100
tree df46dd982d5954ed778440690fccc755db68a34c
parent 69f279d7fd266c80584eb845291a6ba3df26631b

tdf#120703 PVS: V560 A part of conditional expression is always true/false

Change-Id: Ifb3c9016019977aa2c51dbd0a0394a0f81150df5
Reviewed-on: https://gerrit.libreoffice.org/63270
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

sc/source/ui/unoobj/cellsuno.cxx

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 15d5a9b..5d318c0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8269,7 +8269,7 @@
        else if ( pEntry->nWID == SC_WID_UNO_CODENAME )
        {
            OUString aCodeName;
            if ( pDocSh && ( aValue >>= aCodeName ) )
            if (aValue >>= aCodeName)
            {
                pDocSh->GetDocument().SetCodeName( GetTab_Impl(), aCodeName );
            }

sc/source/ui/view/cellsh1.cxx

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c57d3e7..0005ae9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1370,7 +1370,7 @@
                            // if ChangeTrack MoveMode disable
                            pDlg->SetChangeTrack( pDoc->GetChangeTrack() != nullptr );
                            // fdo#56098  disable shift if necessary
                            if ( !bOtherDoc  && pOwnClip )
                            if (!bOtherDoc)
                            {
                                ScViewData* pData = GetViewData();
                                if ( pData->GetMarkData().GetTableSelect( pData->GetTabNo() ) )

writerfilter/source/dmapper/CellColorHandler.cxx

diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index f3e63a4..4124803 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -280,7 +280,7 @@
    {
        if (nWW8BrushStyle || !m_bAutoFillColor)
            pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_SOLID));
        else if ( m_bFillSpecified && m_bAutoFillColor )
        else if (m_bFillSpecified) // m_bAutoFillColor == true
            pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_NONE));

        pPropertyMap->Insert(PROP_FILL_COLOR, uno::makeAny(nApplyColor));