sw/source/core/unocore/unosect.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1a27475accffed4134f884f86c28d17110e0b8fd
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Nov 20 01:16:33 2014 +0100
expand complex cascading conditional operator
Change-Id: Ife2f8bd92bbcca8daba510ca021d99bf7ee86af9
Reviewed-on: https://gerrit.libreoffice.org/13004
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/sw/source/core/unocore/unosect.cxx
b/sw/source/core/unocore/unosect.cxx
index 2ebca72..396b50a 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -301,11 +301,11 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException, std::exception)
{
m_pImpl->m_sName = "TextSection";
}
- SectionType eType = (m_pImpl->m_pProps->m_bDDE)
- ? DDE_LINK_SECTION
- : ((!m_pImpl->m_pProps->m_sLinkFileName.isEmpty() ||
- !m_pImpl->m_pProps->m_sSectionRegion.isEmpty())
- ? FILE_LINK_SECTION : CONTENT_SECTION);
+ SectionType eType(FILE_LINK_SECTION);
+ if( m_pImpl->m_pProps->m_bDDE )
+ eType = DDE_LINK_SECTION;
+ else if( m_pImpl->m_pProps->m_sLinkFileName.isEmpty() &&
m_pImpl->m_pProps->m_sSectionRegion.isEmpty() )
+ eType = CONTENT_SECTION;
// index header section?
if (m_pImpl->m_bIndexHeader)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
