oox/source/export/drawingml.cxx | 5 ++++-
sd/qa/unit/data/odp/tdf93883.odp |binary
sd/qa/unit/export-tests.cxx | 12 ++++++++++++
solenv/gbuild/platform/unxgcc.mk | 3 +++
solenv/gbuild/platform/windows.mk | 3 +++
vcl/source/app/svmain.cxx | 5 ++++-
6 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit c720aeead20cd9f7a675970ae3810b9904dade84
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Thu May 19 13:35:13 2016 -0500
shortcut the signal handler during batch test
Reviewed-on: https://gerrit.libreoffice.org/25178
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit 9d2f7be4e65595241db3cf5135b69bd9e4ce6a30)
try to avoid 'by-design' solar-mutex deadlock during ci
Reviewed-on: https://gerrit.libreoffice.org/25839
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit 6b3b352b06d92ef20194b9a992a521af2ef07b48)
Change-Id: I7848555743e8d54e755dc82cbf0148eeed54110f
Reviewed-on: https://gerrit.libreoffice.org/25978
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 278006b..bc44906 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -17,6 +17,9 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+# to block heavy exception handling that try to acquire the solarmutex
+export LO_LEAN_EXCEPTION=1
+
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XXXXXX
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index a2e621d..ebd2a3c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -8,6 +8,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+# to block heavy exception handling that try to acquire the solarmutex
+export LO_LEAN_EXCEPTION=1
+
# to avoid flashing windows during tests
export VCL_HIDE_WINDOWS=1
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2b315b2..69ab53b 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -95,6 +95,8 @@
using namespace ::com::sun::star;
+static bool g_bIsLeanException;
+
static bool isInitVCL();
oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/,
oslSignalInfo* pInfo)
@@ -102,7 +104,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void*
/*pData*/, oslSignalInfo
static volatile bool bIn = false;
// if we crash again, bail out immediately
- if ( bIn )
+ if ( bIn || g_bIsLeanException)
return osl_Signal_ActCallNextHdl;
ExceptionCategory nVCLException = ExceptionCategory::NONE;
@@ -302,6 +304,7 @@ bool InitVCL()
pSVData->maGDIData.mpScreenFontCache = new ImplFontCache;
pSVData->maGDIData.mpGrfConverter = new GraphicConverter;
+ g_bIsLeanException = getenv("LO_LEAN_EXCEPTION") ? true : false;
// Set exception handler
pExceptionHandler = osl_addSignalHandler(VCLExceptionSignal_impl, nullptr);
commit 02a5941c6ea747fa26dcbb27aa45ef9faac9c857
Author: Mark Hung <mark...@gmail.com>
Date: Tue May 31 01:22:11 2016 +0800
tdf#93883 don't add space to empty paragraph when bullet is turned off.
Change-Id: Ia1bad61cb5585dae0501e8cd657fc84bfea60ab2
Reviewed-on: https://gerrit.libreoffice.org/25679
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 005ae2fa195bddd1073f3d883cf041d9ac80fad1)
Reviewed-on: https://gerrit.libreoffice.org/25984
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 880351d..dfa46d7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1583,6 +1583,9 @@ void DrawingML::WriteRun( const Reference< XTextRange >&
rRun )
sal_Int16 nLevel = -1;
GET( nLevel, NumberingLevel );
+ bool bNumberingIsNumber = true;
+ GET( bNumberingIsNumber, NumberingIsNumber );
+
bool bIsURLField = false;
OUString sFieldValue = GetFieldValue( rRun, bIsURLField );
bool bWriteField = !( sFieldValue.isEmpty() || bIsURLField );
@@ -1590,7 +1593,7 @@ void DrawingML::WriteRun( const Reference< XTextRange >&
rRun )
OUString sText = rRun->getString();
//if there is no text following the bullet, add a space after the bullet
- if (nLevel !=-1 && sText.isEmpty() )
+ if (nLevel !=-1 && bNumberingIsNumber && sText.isEmpty() )
sText=" ";
if ( bIsURLField )
diff --git a/sd/qa/unit/data/odp/tdf93883.odp b/sd/qa/unit/data/odp/tdf93883.odp
new file mode 100755
index 0000000..54d589c
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf93883.odp differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 1665ac2..a7fd605 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -131,6 +131,7 @@ public:
void testTableCellBorder();
void testBulletColor();
void testTdf62176();
+ void testTdf93883();
void testBulletCharAndFont();
void testBulletMarginAndIndentation();
void testParaMarginAndindentation();
@@ -186,6 +187,7 @@ public:
CPPUNIT_TEST(testTableCellBorder);
CPPUNIT_TEST(testBulletColor);
CPPUNIT_TEST(testTdf62176);
+ CPPUNIT_TEST(testTdf93883);
CPPUNIT_TEST(testBulletCharAndFont);
CPPUNIT_TEST(testBulletMarginAndIndentation);
CPPUNIT_TEST(testParaMarginAndindentation);
@@ -1074,6 +1076,16 @@ void SdExportTest::testTdf62176()
xDocShRef->DoClose();
}
+void SdExportTest::testTdf93883()
+{
+ ::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf93883.odp"), ODP);
+ xDocShRef = saveAndReload( xDocShRef, PPTX );
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0,
xDocShRef ) );
+ uno::Reference<text::XTextRange> const xParagraph( getParagraphFromShape(
0, xShape ) );
+ uno::Reference< beans::XPropertySet > xPropSet( xParagraph,
uno::UNO_QUERY_THROW );
+ CPPUNIT_ASSERT(!xPropSet->getPropertyValue("NumberingLevel").hasValue());
+}
+
void SdExportTest::testBulletCharAndFont()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/odp/bulletCharAndFont.odp"), ODP);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
