[Libreoffice-commits] core.git: 3 commits - include/sax sax/Library_fastsax.mk sax/source sw/source

[Michael Stahl]

 include/sax/fastparser.hxx               |    7 ++++--
 include/sax/fastsaxdllapi.h              |   33 +++++++++++++++++++++++++++++++
 sax/Library_fastsax.mk                   |    2 -
 sax/source/fastparser/fastparser.cxx     |    2 -
 sw/source/core/access/accnotextframe.cxx |    2 +
 sw/source/core/doc/docnew.cxx            |    1 
 6 files changed, 43 insertions(+), 4 deletions(-)

New commits:
commit b6785eb5952b23748abb2ff56f004747648920d1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 3 13:16:24 2013 +0100

    sax: stop using SAX_DLLIMPLEMENTATION for both sax and fastsax
    
    Change-Id: I243ec20015beec6b98ee0af55eb7c387008f32f1

diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index 578b114..afd5add 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
 
-#include "saxdllapi.h"
+#include <sax/fastsaxdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace xml { namespace sax {
 
@@ -41,7 +41,10 @@ namespace sax_fastparser {
 class FastSaxParserImpl;
 
 // This class implements the external Parser interface
-class SAX_DLLPUBLIC FastSaxParser : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastParser, ::com::sun::star::lang::XServiceInfo >
+class FASTSAX_DLLPUBLIC FastSaxParser
+    : public ::cppu::WeakImplHelper2<
+                ::com::sun::star::xml::sax::XFastParser,
+                ::com::sun::star::lang::XServiceInfo >
 {
     FastSaxParserImpl* mpImpl;
 
diff --git a/include/sax/fastsaxdllapi.h b/include/sax/fastsaxdllapi.h
new file mode 100644
index 0000000..e532dd2
--- /dev/null
+++ b/include/sax/fastsaxdllapi.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SAX_FASTSAXDLLAPI_H
+#define INCLUDED_SAX_FASTSAXDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined FASTSAX_DLLIMPLEMENTATION
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 4f98820..1fcb503 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,fastsax,\
 ))
 
 $(eval $(call gb_Library_add_defs,fastsax,\
-    -DSAX_DLLIMPLEMENTATION \
+    -DFASTSAX_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,fastsax))
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 3bff430..4f835d5 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -83,7 +83,7 @@ struct Event
     CallbackType maType;
 };
 
-struct SAX_DLLPUBLIC NameWithToken
+struct NameWithToken
 {
     OUString msName;
     sal_Int32 mnToken;
commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 3 12:28:42 2013 +0100

    SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrm
    
    In ~SwDoc when a SwFmt is deleted,
    SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which
    at that point was already deleted too; avoid that by returning early.
    
    This can be reproduced by closing the bugdoc from fdo#71450.
    
    Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index f50b19d..f9c6dac 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -98,6 +98,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
          msTitle.isEmpty() )
     {
         SwAccessibleFrameBase::Modify( pOld, pNew );
+        if (!GetRegisteredIn())
+            return; // probably was deleted - avoid doing anything
     }
 
     const SwNoTxtNode *pNd = GetNoTxtNode();
commit c6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 3 00:32:30 2013 +0100

    sw: valgrind complains about uninitialized mbIsPrepareSelAll
    
    Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index e795600..86f43cb 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -277,6 +277,7 @@ SwDoc::SwDoc()
     mbLinksUpdated( false ), //#i38810#
     mbClipBoard( false ),
     mbColumnSelection( false ),
+    mbIsPrepareSelAll(false),
 #ifdef DBG_UTIL
     mbXMLExport(false),
 #endif