[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sax/source

[Michael Meeks]

 sax/source/fastparser/fastparser.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8da7d7226777788bc957e474f5c9fcb9b78dc54e
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Dec 31 12:04:21 2013 +0000

    fastparser: avoid boost::optional where it is un-necessary.
    
    boost::optional appears to show up rather heavily on many profiles.
    We already use mnElementToken == DONTKNOW to flag / use these guys.
    
    Change-Id: Ibf2b0167f259cc601da2fb9703e880b78e60886e
    Reviewed-on: https://gerrit.libreoffice.org/7424
    Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 0a609a1..0cfdb14 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -95,10 +95,10 @@ struct NameWithToken
 
 struct SaxContext
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > mxContext;
-    sal_Int32                   mnElementToken;
-    boost::optional< OUString > maNamespace;
-    boost::optional< OUString > maElementName;
+    Reference< XFastContextHandler > mxContext;
+    sal_Int32 mnElementToken;
+    OUString  maNamespace;
+    OUString  maElementName;
 
     SaxContext( sal_Int32 nElementToken, const OUString& aNamespace, const OUString& aElementName ):
             mnElementToken(nElementToken)
@@ -500,7 +500,7 @@ void Entity::endElement()
         if( nElementToken != FastToken::DONTKNOW )
             xContext->endFastElement( nElementToken );
         else
-            xContext->endUnknownElement( aContext.maNamespace.get(), aContext.maElementName.get() );
+            xContext->endUnknownElement( aContext.maNamespace, aContext.maElementName );
     }
     catch (const Exception& e)
     {