loplugin:simplifypointertobool improve

to look for the
x.get() != null
pattern, which can be simplified to
x

I'll do the
x.get() == nullptr
pattern in a separate patch, to reduce the chances of a mistake

Change-Id: I45e0d178e75359857cdf50d712039cb526016555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95354
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 14 insertions, 14 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 475e7d9b5f77..0511b6677ba2 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2508,7 +2508,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
     case NS_ooxml::LN_ffdata:
     {
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
         {
             FFDataHandler::Pointer_t pFFDataHandler(new FFDataHandler());
 
@@ -2522,14 +2522,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
     {
         m_pImpl->m_pSdtHelper->setInsideDropDownControl(true);
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
     }
     break;
     case NS_ooxml::LN_CT_SdtDropDownList_listItem:
     {
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
     }
     break;
@@ -2590,7 +2590,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
 
         // process subitems
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
 
         if (nSprmId == NS_ooxml::LN_CT_SdtPr_alias)
@@ -2879,21 +2879,21 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
     case NS_ooxml::LN_CT_DocPartPr_name:
     {
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
     }
     break;
     case NS_ooxml::LN_CT_DocPartPr_category:
     {
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
     }
     break;
     case NS_ooxml::LN_CT_DocPartCategory_gallery:
     {
         writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pProperties->resolve(*this);
     }
     break;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index dd5a14b732eb..a42478a2b0df 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -87,7 +87,7 @@ void DomainMapperTableHandler::startTable(const TablePropertyMapPtr& pProps)
 #ifdef DBG_UTIL
     TagLogger::getInstance().startElement("tablehandler.table");
 
-    if (pProps.get() != nullptr)
+    if (pProps)
         pProps->dumpXml();
 #endif
 }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 915b317d40d5..d0f46d312128 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -127,7 +127,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
         bRet = true;
         sal_uInt32 nSprmId = rSprm.getId();
         Value::Pointer_t pValue = rSprm.getValue();
-        sal_Int32 nIntValue = ((pValue.get() != nullptr) ? pValue->getInt() : 0);
+        sal_Int32 nIntValue = (pValue ? pValue->getInt() : 0);
         switch ( nSprmId )
         {
             case NS_ooxml::LN_CT_TblPrBase_tblW:
@@ -514,7 +514,7 @@ void DomainMapperTableManager::endLevel( )
 #ifdef DBG_UTIL
     TagLogger::getInstance().startElement("dmappertablemanager.endLevel");
     PropertyMapPtr pProps = getTableProps().get();
-    if (pProps.get() != nullptr)
+    if (pProps)
         getTableProps()->dumpXml();
 
     TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fb58e1b9567b..18fb4fa3d982 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5957,7 +5957,7 @@ void DomainMapper_Impl::PopFieldContext()
                     else
                     {
                         FormControlHelper::Pointer_t pFormControlHelper(pContext->getFormControlHelper());
-                        if (pFormControlHelper.get() != nullptr)
+                        if (pFormControlHelper)
                         {
                             uno::Reference< text::XFormField > xFormField( pContext->GetFormField() );
                             assert(xCrsr.is());
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 73333b23e790..5155e2f61211 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1386,7 +1386,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
             //there seems to be no way to detect the original size via _real_ API
             uno::Reference< beans::XPropertySet > xGraphicProperties(rxGraphic, uno::UNO_QUERY_THROW);
 
-            if (m_pImpl->mpWrapPolygon.get() != nullptr)
+            if (m_pImpl->mpWrapPolygon)
             {
                 uno::Any aContourPolyPolygon;
                 awt::Size aGraphicSize;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index d03be9cba324..80a0df186407 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1018,7 +1018,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
                             //TODO: Handle cases where a paragraph <> character style relation is needed
                             StyleSheetEntryPtr pParent = FindStyleSheetByISTD( pEntry->sBaseStyleIdentifier );
                             // Writer core doesn't support numbering styles having a parent style, it seems
-                            if (pParent.get() != nullptr && !bListStyle)
+                            if (pParent && !bListStyle)
                             {
                                 const OUString sParentStyleName = ConvertStyleName( pParent->sStyleName );
                                 if ( !sParentStyleName.isEmpty() && !xStyles->hasByName( sParentStyleName ) )
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index abce3a1e6b14..a0185eaa735a 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -54,7 +54,7 @@ namespace writerfilter::dmapper {
         bool bRet = true;
         sal_uInt32 nSprmId = rSprm.getId();
         Value::Pointer_t pValue = rSprm.getValue();
-        sal_Int32 nIntValue = ((pValue.get() != nullptr) ? pValue->getInt() : 0);
+        sal_Int32 nIntValue = (pValue ? pValue->getInt() : 0);
         switch( nSprmId )
         {
             case NS_ooxml::LN_CT_TrPrBase_jc: