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

Miklos Vajna vmiklos at collabora.co.uk
Wed Mar 18 00:06:47 PDT 2015


 sw/source/filter/ww8/docxattributeoutput.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f52cf060efaf499f9b13427141e7e3f0718713e1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 18 08:05:42 2015 +0100

    DocxAttributeOutput::TableBackgrounds: use unique_ptr
    
    Change-Id: I312d3d94c54f9a8537e2d22d347a75bd40360b80

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 64d9199..0382b01 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3384,7 +3384,7 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_
     }
     else
     {
-        ::sax_fastparser::FastAttributeList* pAttrList = NULL;
+        std::unique_ptr<sax_fastparser::FastAttributeList> pAttrList;
 
         for( aGrabBagElement = aGrabBag.begin(); aGrabBagElement != aGrabBag.end(); ++aGrabBagElement )
         {
@@ -3411,8 +3411,7 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_
             else if( aGrabBagElement->first == "val")
                 AddToAttrList( pAttrList, FSNS( XML_w, XML_val ), sValue.getStr() );
         }
-        m_pSerializer->singleElementNS( XML_w, XML_shd,
-                XFastAttributeListRef( pAttrList ) );
+        m_pSerializer->singleElementNS( XML_w, XML_shd, XFastAttributeListRef( pAttrList.release() ) );
     }
 }
 


More information about the Libreoffice-commits mailing list