[Libreoffice-commits] core.git: 2 commits - dbaccess/source xmloff/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinController.cxx |    2 +-
 xmloff/source/core/xmlexp.cxx                     |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 2ecf0ced9d2e55881033786fe95d45ceaeb73d37
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 28 15:20:48 2015 +0100

    VclPtr: assert with query dialog open on closing query design
    
    Change-Id: I40d196462ff2e37d86ca367d3a150c94872715f1

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index ac48303..3852ef9 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -170,7 +170,7 @@ OJoinDesignView* OJoinController::getJoinView()
 
 void OJoinController::disposing()
 {
-    m_pAddTableDialog   = NULL;
+    m_pAddTableDialog.disposeAndClear();
 
     OJoinController_BASE::disposing();
 
commit 9bc314e38b6bcc268fe519b6d771a60087a1af9e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 22 10:59:01 2015 +0100

    add field namespace to styles.xml when saving fdo85232-1.docx to .odt
    
    when >= SvtSaveOptions::ODFVER_012
    
    Change-Id: I0414bc4a83ae4787e10cd8a215555f249da7e65a

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 405a660..7b29bd7 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -336,6 +336,7 @@ void SvXMLExport::_InitCtor()
         mpNamespaceMap->Add( GetXMLToken(XML_NP_STYLE), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
     }
 
+    bool bAddFieldNM = false;
     // namespaces for documents
     if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
@@ -363,6 +364,7 @@ void SvXMLExport::_InitCtor()
             mpNamespaceMap->Add(
                 GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT),
                 XML_NAMESPACE_LO_EXT);
+            bAddFieldNM = true;
         }
     }
     if( getExportFlags() & (SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
@@ -380,9 +382,13 @@ void SvXMLExport::_InitCtor()
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XFORMS_1_0), GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
-        mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
+        bAddFieldNM = true;
     }
+
+    if (bAddFieldNM)
+        mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
+
     // RDFa: needed for content and header/footer styles
     if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {