summaryrefslogtreecommitdiffstats
path: root/cppu/source/uno/lbmap.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-04-17 15:42:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-04-18 09:56:28 +0200
commitc12a5e83802699615d4226c83c2e6f135a3485b4 (patch)
tree65c9f27a8dcc68d8ddaa17fd7db674c97f47dd08 /cppu/source/uno/lbmap.cxx
parentMove implementation of CELL("format";...) to SvNumberFormatter, tdf#132106 prep (diff)
downloadcore-c12a5e83802699615d4226c83c2e6f135a3485b4.tar.gz
core-c12a5e83802699615d4226c83c2e6f135a3485b4.zip
loplugin:flatten in cppu
Change-Id: I202698a0310bd26b98c1f744c8f21288f87643f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92450 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppu/source/uno/lbmap.cxx')
-rw-r--r--cppu/source/uno/lbmap.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index ad27087b9b02..5fc1ab82eb9c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -236,32 +236,32 @@ static void mediate_mapInterface(
typelib_InterfaceTypeDescription * pInterfaceTypeDescr )
{
OSL_ENSURE( pMapping && ppOut, "### null ptr!" );
- if (pMapping && ppOut)
- {
- uno_Mediate_Mapping * that = static_cast< uno_Mediate_Mapping * >( pMapping );
- uno_Mapping * pFrom2Uno = that->aFrom2Uno.get();
+ if (!(pMapping && ppOut))
+ return;
- uno_Interface * pUnoI = nullptr;
- (*pFrom2Uno->mapInterface)( pFrom2Uno, reinterpret_cast<void **>(&pUnoI), pInterface, pInterfaceTypeDescr );
- if (nullptr == pUnoI)
- {
- void * pOut = *ppOut;
- if (nullptr != pOut)
- {
- uno_ExtEnvironment * pTo = that->aTo.get()->pExtEnv;
- OSL_ENSURE( nullptr != pTo, "### cannot release out interface: leaking!" );
- if (nullptr != pTo)
- (*pTo->releaseInterface)( pTo, pOut );
- *ppOut = nullptr; // set to 0 anyway, because mapping was not successful!
- }
- }
- else
+ uno_Mediate_Mapping * that = static_cast< uno_Mediate_Mapping * >( pMapping );
+ uno_Mapping * pFrom2Uno = that->aFrom2Uno.get();
+
+ uno_Interface * pUnoI = nullptr;
+ (*pFrom2Uno->mapInterface)( pFrom2Uno, reinterpret_cast<void **>(&pUnoI), pInterface, pInterfaceTypeDescr );
+ if (nullptr == pUnoI)
+ {
+ void * pOut = *ppOut;
+ if (nullptr != pOut)
{
- uno_Mapping * pUno2To = that->aUno2To.get();
- (*pUno2To->mapInterface)( pUno2To, ppOut, pUnoI, pInterfaceTypeDescr );
- (*pUnoI->release)( pUnoI );
+ uno_ExtEnvironment * pTo = that->aTo.get()->pExtEnv;
+ OSL_ENSURE( nullptr != pTo, "### cannot release out interface: leaking!" );
+ if (nullptr != pTo)
+ (*pTo->releaseInterface)( pTo, pOut );
+ *ppOut = nullptr; // set to 0 anyway, because mapping was not successful!
}
}
+ else
+ {
+ uno_Mapping * pUno2To = that->aUno2To.get();
+ (*pUno2To->mapInterface)( pUno2To, ppOut, pUnoI, pInterfaceTypeDescr );
+ (*pUnoI->release)( pUnoI );
+ }
}
}