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>

5 files changed, 22 insertions, 22 deletions

diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index c582b71aba82..92c74e78e63a 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -299,7 +299,7 @@ void OOXMLPictureHandler::attribute(Id name, Value & val)
     {
         writerfilter::Reference<Properties>::Pointer_t pProps
             (val.getProperties());
-        if (pProps.get() != nullptr)
+        if (pProps)
             pProps->resolve(*this);
     }
 }
@@ -309,7 +309,7 @@ void OOXMLPictureHandler::sprm(Sprm & rSprm)
     writerfilter::Reference<Properties>::Pointer_t pProps
         (rSprm.getProps());
 
-    if (pProps.get() != nullptr)
+    if (pProps)
         pProps->resolve(*this);
 }
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 6bc7a10e8df1..9c2c51c36a2c 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -167,7 +167,7 @@ void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler,
     Id nDefine = pHandler->getDefine();
     OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
 
-    if (pFactory.get() != nullptr)
+    if (pFactory)
     {
         pFactory->charactersAction(pHandler, rString);
     }
@@ -178,7 +178,7 @@ void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler)
     Id nDefine = pHandler->getDefine();
     OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
 
-    if (pFactory.get() != nullptr)
+    if (pFactory)
     {
         pFactory->startAction(pHandler);
     }
@@ -189,7 +189,7 @@ void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler)
     Id nDefine = pHandler->getDefine();
     OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
 
-    if (pFactory.get() != nullptr)
+    if (pFactory)
     {
         pFactory->endAction(pHandler);
     }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6a31e6b69a97..42888678f98e 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -877,7 +877,7 @@ void OOXMLFastContextHandler::sendPropertyToParent()
     {
         OOXMLPropertySet::Pointer_t pProps(mpParent->getPropertySet());
 
-        if (pProps.get() != nullptr)
+        if (pProps)
         {
             pProps->add(mId, getValue(), OOXMLProperty::SPRM);
         }
@@ -890,11 +890,11 @@ void OOXMLFastContextHandler::sendPropertiesToParent()
     {
         OOXMLPropertySet::Pointer_t pParentProps(mpParent->getPropertySet());
 
-        if (pParentProps.get() != nullptr)
+        if (pParentProps)
         {
             OOXMLPropertySet::Pointer_t pProps(getPropertySet());
 
-            if (pProps.get() != nullptr)
+            if (pProps)
             {
                 OOXMLValue::Pointer_t pValue
                     (new OOXMLPropertySetValue(getPropertySet()));
@@ -1123,7 +1123,7 @@ void OOXMLFastContextHandlerProperties::handleHyperlinkURL() {
 void OOXMLFastContextHandlerProperties::setPropertySet
 (const OOXMLPropertySet::Pointer_t& pPropertySet)
 {
-    if (pPropertySet.get() != nullptr)
+    if (pPropertySet)
         mpPropertySet = pPropertySet;
 }
 
@@ -1289,7 +1289,7 @@ void OOXMLFastContextHandlerTable::addCurrentChild()
     {
         OOXMLValue::Pointer_t pValue(pHandler->getValue());
 
-        if (pValue.get() != nullptr)
+        if (pValue)
         {
             OOXMLTable::ValuePointer_t pTmpVal(pValue->clone());
             mTable.add(pTmpVal);
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 576e97c8ce7a..bab418a2f2ff 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -110,7 +110,7 @@ const OUString & OOXMLParserState::getTarget() const
 
 void OOXMLParserState::resolveCharacterProperties(Stream & rStream)
 {
-    if (mpCharacterProps.get() != nullptr)
+    if (mpCharacterProps)
     {
         rStream.props(mpCharacterProps.get());
         mpCharacterProps = new OOXMLPropertySet;
@@ -157,7 +157,7 @@ void OOXMLParserState::resolveCellProperties(Stream & rStream)
     {
         OOXMLPropertySet::Pointer_t & rCellProps = mCellProps.top();
 
-        if (rCellProps.get() != nullptr)
+        if (rCellProps)
         {
             rStream.props(rCellProps.get());
             rCellProps = new OOXMLPropertySet;
@@ -171,7 +171,7 @@ void OOXMLParserState::resolveRowProperties(Stream & rStream)
     {
         OOXMLPropertySet::Pointer_t & rRowProps = mRowProps.top();
 
-        if (rRowProps.get() != nullptr)
+        if (rRowProps)
         {
             rStream.props(rRowProps.get());
             rRowProps = new OOXMLPropertySet;
@@ -185,7 +185,7 @@ void OOXMLParserState::resolveTableProperties(Stream & rStream)
     {
         OOXMLPropertySet::Pointer_t & rTableProps = mTableProps.top();
 
-        if (rTableProps.get() != nullptr)
+        if (rTableProps)
         {
             rStream.props(rTableProps.get());
             // Don't clean the table props to send them again for each row
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index b8071011422b..e7e1c8d581c9 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -49,7 +49,7 @@ Value::Pointer_t OOXMLProperty::getValue()
 {
     Value::Pointer_t pResult;
 
-    if (mpValue.get() != nullptr)
+    if (mpValue)
         pResult = Value::Pointer_t(mpValue->clone());
     else
         pResult = Value::Pointer_t(new OOXMLValue());
@@ -61,7 +61,7 @@ writerfilter::Reference<Properties>::Pointer_t OOXMLProperty::getProps()
 {
     writerfilter::Reference<Properties>::Pointer_t pResult;
 
-    if (mpValue.get() != nullptr)
+    if (mpValue)
         pResult = mpValue->getProperties();
 
     return pResult;
@@ -94,7 +94,7 @@ string OOXMLProperty::toString() const
 
     sResult += getName();
     sResult += ", ";
-    if (mpValue.get() != nullptr)
+    if (mpValue)
         sResult += mpValue->toString();
     else
         sResult +="(null)";
@@ -341,7 +341,7 @@ void OOXMLPropertySet::resolve(Properties & rHandler)
     {
         OOXMLProperty::Pointer_t pProp = mProperties[nIt];
 
-        if (pProp.get() != nullptr)
+        if (pProp)
             pProp->resolve(rHandler);
     }
 }
@@ -370,7 +370,7 @@ OOXMLPropertySet::end() const
 
 void OOXMLPropertySet::add(const OOXMLProperty::Pointer_t& pProperty)
 {
-    if (pProperty.get() != nullptr && pProperty->getId() != 0x0)
+    if (pProperty && pProperty->getId() != 0x0)
     {
         mProperties.push_back(pProperty);
     }
@@ -416,7 +416,7 @@ string OOXMLPropertySet::toString()
         if (aIt != aItBegin)
             sResult += ", ";
 
-        if ((*aIt).get() != nullptr)
+        if (*aIt)
             sResult += (*aIt)->toString();
         else
             sResult += "0x0";
@@ -772,7 +772,7 @@ void OOXMLTable::resolve(Table & rTable)
         writerfilter::Reference<Properties>::Pointer_t pProperties
             (rPropSet->getProperties());
 
-        if (pProperties.get() != nullptr)
+        if (pProperties)
             pTable->entry(nPos, pProperties);
 
         ++nPos;
@@ -781,7 +781,7 @@ void OOXMLTable::resolve(Table & rTable)
 
 void OOXMLTable::add(const ValuePointer_t& pPropertySet)
 {
-    if (pPropertySet.get() != nullptr)
+    if (pPropertySet)
         mPropertySets.push_back(pPropertySet);
 }