[Libreoffice-commits] core.git: writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Wed Sep 7 12:27:21 UTC 2016


 writerfilter/source/dmapper/TableManager.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bece2e8415a9ef33bba492569c7c21e58878a836
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Sep 7 14:24:41 2016 +0200

    writerfilter: avoid redundant get() call on smart pointer in TableManager
    
    Change-Id: Ie9361fb64a199a9690e2c6bc62a891406fb8b4b9

diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index b574d83..d9f5079 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -214,7 +214,7 @@ void TableManager::ensureOpenCell(const TablePropertyMapPtr& pProps)
     {
         TableData::Pointer_t pTableData = mTableDataStack.top();
 
-        if (pTableData.get() != nullptr)
+        if (pTableData != nullptr)
         {
             if (!pTableData->isCellOpen())
                 openCell(getHandle(), pProps);
@@ -286,7 +286,7 @@ void TableManager::resolveCurrentTable()
     TagLogger::getInstance().startElement("tablemanager.resolveCurrentTable");
 #endif
 
-    if (mpTableDataHandler.get() != nullptr)
+    if (mpTableDataHandler != nullptr)
     {
         try
         {
@@ -331,7 +331,7 @@ void TableManager::resolveCurrentTable()
 
 void TableManager::endLevel()
 {
-    if (mpTableDataHandler.get() != nullptr)
+    if (mpTableDataHandler != nullptr)
         resolveCurrentTable();
 
     // Store the unfinished row as it will be used for the next table
@@ -349,7 +349,7 @@ void TableManager::endLevel()
     TagLogger::getInstance().startElement("tablemanager.endLevel");
     TagLogger::getInstance().attribute("level", mTableDataStack.size());
 
-    if (pTableData.get() != nullptr)
+    if (pTableData != nullptr)
         TagLogger::getInstance().attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
 
     TagLogger::getInstance().endElement();
@@ -367,7 +367,7 @@ void TableManager::startLevel()
     TagLogger::getInstance().startElement("tablemanager.startLevel");
     TagLogger::getInstance().attribute("level", mTableDataStack.size());
 
-    if (pTableData.get() != nullptr)
+    if (pTableData != nullptr)
         TagLogger::getInstance().attribute("openCell", pTableData->isCellOpen() ? "yes" : "no");
 
     TagLogger::getInstance().endElement();


More information about the Libreoffice-commits mailing list