summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Picca <jumapico@gmail.com>2015-01-31 23:54:21 -0200
committerJulien Nabet <serval2412@yahoo.fr>2015-02-06 23:10:42 +0100
commit90613f4e47e5e113e5fafb573d832bfcace314e5 (patch)
treebc2d7abd6bb60645f4c8d5dd505c79f9ac9cc663
parent9506eaa6faf8f9d38d38d9bb25fa89968e23230c (diff)
fdo#39440: remove redundant checks and breaks
Change-Id: I7706aca6b3850b9d9c8d6d9a78e0034889c6f89c
-rw-r--r--sw/source/core/unocore/unoframe.cxx4
-rw-r--r--sw/source/core/unocore/unostyle.cxx3
2 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 123af06e5d17..b604a7859aec 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1988,7 +1988,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
else if(pFmt)
{
if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) &&
- pEntry &&
(isGRFATR(pEntry->nWID) ||
pEntry->nWID == FN_PARAM_COUNTOUR_PP ||
pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR ||
@@ -2410,8 +2409,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
}
else
{
- if ((eType == FLYCNTTYPE_GRF) &&
- pEntry && isGRFATR(pEntry->nWID))
+ if ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID))
{
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
if(pIdx)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 6b64b8473206..d8dfed2cd3cc 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3510,7 +3510,6 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
{
// these slots are exclusive to Header/Footer, thus this is an error
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
- break;
}
default:
{
@@ -3605,7 +3604,6 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
case FN_UNO_FOOTER_FIRST :
{
throw lang::IllegalArgumentException();
- break;
}
default:
{
@@ -3777,7 +3775,6 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
{
// these slots are exclusive to Header/Footer, thus this is an error
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
- break;
}
default:
{