[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unoxml/source

[Michael Stahl]

 unoxml/source/dom/node.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 422db2834c81d7a1d38b760209f7dec4a3cf43e0
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Fri Jun 8 19:04:37 2012 +0530

    n759982: Win/VC++ stl messes up the namespace vector.
    
    Every file's first element wasn't imported. This fixes the issue.
    (everyfile = everyfile imported via that path e.g. theme?.xml)
    (cherry picked from commit 25dd603fe2044f35341fe0c6d0b632c9295a824e)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 0c5a846..5ce052f 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -65,8 +65,11 @@ namespace DOM
 {
     void pushContext(Context& io_rContext)
     {
-        io_rContext.maNamespaces.push_back(
-            io_rContext.maNamespaces.back());
+        // Explicitly use a temp. variable.
+        // Windows/VC++ seems to mess up if .back() is directly passed as
+        // parameter. i.e. Don't use push_back( .back() );
+        Context::NamespaceVectorType::value_type aVal = io_rContext.maNamespaces.back();
+        io_rContext.maNamespaces.push_back( aVal );
     }
 
     void popContext(Context& io_rContext)