commit 55f267856e11492ae11beadbeb553dd6717de809
author Mike Kaganski <mike.kaganski@collabora.com> Wed Nov 07 09:44:24 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Sun Nov 11 08:56:37 2018 +0100
tree 126b6b4c84eadf61a2f2b712970f19b31dd69cd2
parent 25ddf69517134305d4dffd5dc1d111fe74584fac

tdf#120703 PVS: remove non-functional check

V547 Expression is always false. Probably the '||' operator should be used here.

Was like that since commit df64bd535f01aa264dc4b0c7abfdaeff299fb482.

Trying to fix it by restoring the intended logic (|| instead of && to disallow
setting stylesheets for Para or Page) breaks several tests in
CppunitTest_sd_import_tests; apparently the code relies on these families
getting stylesheets. So just drop the non-functional (always false) condition.

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

svx/source/svdraw/svdobj.cxx

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 19bbc62..4306767 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2162,10 +2162,6 @@

void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
    // only allow graphic and presentation styles for shapes
    if( pNewStyleSheet && (pNewStyleSheet->GetFamily() == SfxStyleFamily::Para) && (pNewStyleSheet->GetFamily() == SfxStyleFamily::Page) )
        return;

    GetProperties().SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
}