Attachment 107661 Details for Bug 84872 – /tmp/debug.patch

[patch] /tmp/debug.patch

debug.patch (text/plain), 1.61 KB, created by Caolán McNamara on 2014-10-10 13:14:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2014-10-10 13:14:41 UTC

Size: 1.61 KB

patch

obsolete

>diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
>index 77ecaee..398ed3a 100644
>--- a/sc/source/filter/oox/formulaparser.cxx
>+++ b/sc/source/filter/oox/formulaparser.cxx
>@@ -26,6 +26,7 @@
> #include <com/sun/star/sheet/NameToken.hpp>
> #include <com/sun/star/sheet/ReferenceFlags.hpp>
> #include <com/sun/star/sheet/SingleReference.hpp>
>+#include <osl/thread.hxx>
> #include <oox/core/filterbase.hxx>
> #include <oox/token/properties.hxx>
> #include "addressconverter.hxx"
>@@ -703,10 +704,26 @@ Any& FormulaParserImpl::appendRawToken( sal_Int32 nOpCode )
>     return maTokenStorage.append( nOpCode );
> }
> 
>+osl::Mutex aHack;
>+
> Any& FormulaParserImpl::insertRawToken( sal_Int32 nOpCode, size_t nIndexFromEnd )
> {
>-    maTokenIndexes.insert( maTokenIndexes.end() - nIndexFromEnd, maTokenStorage.size() );
>-    return maTokenStorage.append( nOpCode );
>+    fprintf(stderr, "FormulaParserImpl::insertRawToken %p %ld %ld %d\n", this, maTokenIndexes.size(), nIndexFromEnd, osl_getThreadIdentifier(NULL));
>+    fprintf(stderr, "trying to acquire %p in %d\n", this, osl_getThreadIdentifier(NULL));
>+    assert(aHack.tryToAcquire());
>+    try
>+    {
>+        maTokenIndexes.insert( maTokenIndexes.end() - nIndexFromEnd, maTokenStorage.size() );
>+        Any& foo = maTokenStorage.append( nOpCode );
>+        aHack.release();
>+        fprintf(stderr, "released %p in %d\n", this, osl_getThreadIdentifier(NULL));
>+        return foo;
>+    }
>+    catch(...)
>+    {
>+        fprintf(stderr, "WHAT THE FUCK\n");
>+        throw;
>+    }
> }
> 
> size_t FormulaParserImpl::appendWhiteSpaceTokens( const WhiteSpaceVec* pSpaces )

Actions: View | Splinter Review

Attachments on bug 84872: 107659 | 107661

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.