diff options
Diffstat (limited to 'sw/source/core/unocore/unoftn.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoftn.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 0687eae3b518..bdf91c63ad86 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -63,9 +63,7 @@ public: , m_rThis(rThis) , m_bIsEndnote(bIsEndnote) , m_EventListeners(m_Mutex) -// #i111177#: unxsols4 (Sun C++ 5.9 SunOS_sparc) generates wrong code for this -// , m_bIsDescriptor(0 == pFootnote) - , m_bIsDescriptor((0 == pFootnote) ? true : false) + , m_bIsDescriptor(0 == pFootnote) , m_pFmtFtn(pFootnote) { } @@ -322,8 +320,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SwXTextCursor const*const pTextCursor( dynamic_cast<SwXTextCursor*>(pCursor)); - const bool bForceExpandHints( (pTextCursor) - ? pTextCursor->IsAtEndOfMeta() : false ); + const bool bForceExpandHints( pTextCursor && pTextCursor->IsAtEndOfMeta() ); const SetAttrMode nInsertFlags = (bForceExpandHints) ? nsSetAttrMode::SETATTR_FORCEHINTEXPAND : nsSetAttrMode::SETATTR_DEFAULT; |