summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-24 12:41:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-24 13:06:49 +0100
commit97839c6768f09684bfd0d39322896f65b68f8549 (patch)
tree07a11de3c171cee9c57df5315b311abcbf0ed914 /extensions
parent04f66b00738601a789eb76b7a950c0dec6fbb084 (diff)
bogus cppcheck duplicateExpressionTernary warning
Change-Id: I9c6e7699790cc2e526a15daf8c5c25555aa30fc9
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/ole/servprov.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 2467850649be..a38dd90a8a32 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -442,12 +442,14 @@ sal_Bool OleConverter_Impl2::supportsService(OUString const & ServiceName)
css::uno::Sequence<OUString> OleConverter_Impl2::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
{
- return m_nUnoWrapperClass == INTERFACE_OLE_WRAPPER_IMPL
- ? css::uno::Sequence<OUString>{
+ if (m_nUnoWrapperClass == INTERFACE_OLE_WRAPPER_IMPL)
+ {
+ return css::uno::Sequence<OUString>{
"com.sun.star.bridge.OleBridgeSupplier2",
- "com.sun.star.bridge.oleautomation.BridgeSupplier"}
- : css::uno::Sequence<OUString>{
- "com.sun.star.bridge.OleBridgeSupplierVar1"};
+ "com.sun.star.bridge.oleautomation.BridgeSupplier"};
+ }
+ return css::uno::Sequence<OUString>{
+ "com.sun.star.bridge.OleBridgeSupplierVar1"};
}
// XInitialize ------------------------------------------------------------------------------