Change in core[libreoffice-4-0]: docx export: fix regression on table borders export
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: docx export: fix regression on table borders export .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1705 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If31914c412480fdadb775ca6675999ecde3e6bba Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: docx export: fix regression on table borders export
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1705 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/1705/1 docx export: fix regression on table borders export The removed code was supposed to allow LO to write cell borders only if they were different from default cell border. Bug #59275 show that this is incorrect. Change-Id: If31914c412480fdadb775ca6675999ecde3e6bba --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 0 insertions(+), 9 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 475645b..fb0b396 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1466,15 +1466,6 @@ for( int i = 0; i 4; ++i, ++pBrd ) { const SvxBorderLine* pLn = rBox.GetLine( *pBrd ); -if ( pDefaultBorders pLn ) -{ -const SvxBorderLine* pRefLn = pDefaultBorders-GetLine( *pBrd ); - -// If border is equal to default border: do not output -if ( pRefLn *pLn == *pRefLn) { -continue; -} -} if (!tagWritten bWriteTag) { pSerializer-startElementNS( XML_w, tag, FSEND ); -- To view, visit https://gerrit.libreoffice.org/1705 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If31914c412480fdadb775ca6675999ecde3e6bba Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: docx export: add missing arg to impl_pageBorders call
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1672 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/1672/1 docx export: add missing arg to impl_pageBorders call The missing argument could cause data loss due to ill-formatted document produced. Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 3cdc325..475645b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4419,7 +4419,7 @@ m_pSerializer-startElementNS( XML_w, XML_pBdr, FSEND ); } -impl_pageBorders( m_pSerializer, rBox, false, false ); +impl_pageBorders( m_pSerializer, rBox, XML_pBdr, false, false ); if ( m_bOpenedSectPr ) { -- To view, visit https://gerrit.libreoffice.org/1672 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
sal: add timeout option when using pipe in connect mode
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: sal: add timeout option when using pipe in connect mode .. Patch Set 1: Abandoned Not needed anymore. -- To view, visit https://gerrit.libreoffice.org/1310 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I94b9edccf194e971f375853459d73c37bdb4c6a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sw unit test: add call to CalcLayout before using the layout
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1645 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1645/1 sw unit test: add call to CalcLayout before using the layout Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 --- M sw/qa/extras/inc/swmodeltestbase.hxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index cc05b2b..2bb2369 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -88,6 +88,7 @@ // create the dump SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument *(mxComponent.get()); SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc(); +pDoc-GetCurrentViewShell()-CalcLayout(); SwRootFrm* pLayout = pDoc-GetCurrentLayout(); pLayout-dumpAsXml(pXmlWriter); -- To view, visit https://gerrit.libreoffice.org/1645 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] doc export: add unit test for bug i106749
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1646 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1646/1 doc export: add unit test for bug i106749 Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895 --- A sw/qa/extras/ww8export/data/new-page-styles.doc M sw/qa/extras/ww8export/ww8export.cxx 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/sw/qa/extras/ww8export/data/new-page-styles.doc b/sw/qa/extras/ww8export/data/new-page-styles.doc new file mode 100644 index 000..c3886fd --- /dev/null +++ b/sw/qa/extras/ww8export/data/new-page-styles.doc Binary files differ diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 7c61d95..650fbbf 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -43,6 +43,7 @@ void testFirstHeaderFooter(); void testZoom(); void test56513(); +void testNewPageStylesTable(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -63,6 +64,7 @@ {first-header-footer.doc, Test::testFirstHeaderFooter}, {zoom.doc, Test::testZoom}, {fdo56513.doc, Test::test56513}, +{new-page-styles.doc, Test::testNewPageStylesTable}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -154,6 +156,13 @@ CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the second section), parseDump(/root/page[3]/header/txt/text())); } +void Test::testNewPageStylesTable() +{ +CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals and Results (Page 1)*), parseDump(/root/page[1]/header/txt/text())); +CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Assessment (Page 2)), parseDump(/root/page[2]/header/txt/text())); +CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals: Next Year (Page 3)***), parseDump(/root/page[3]/header/txt/text())); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); -- To view, visit https://gerrit.libreoffice.org/1646 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: invalid sectPr added at the beginning of the do...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1647 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1647/1 docx export: invalid sectPr added at the beginning of the doc This reverts commit 60fa5057039d2413d56813df4d45e5cfdfbb40ac, which was a revert of 723f772d (fix for ooo#106749) with an alternative fix to avoid a regression (fdo#56513). This commit contain a fix for the sectPr issue, and does not regress on the 2 previously fixed issue. Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f --- M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8atr.cxx 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index b89a143..01d61c5 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2368,9 +2368,7 @@ } else if ( pNd-IsTableNode() ) { -SwTable * pTable = pNd-GetTableNode()-GetTable(); -OutputSectionBreaks( pTable-GetTableFmt()-GetAttrSet(), *pNd ); -mpTableInfo-processSwTable( pTable ); +mpTableInfo-processSwTable( pNd-GetTableNode()-GetTable() ); } else if ( pNd-IsSectionNode() TXT_MAINTEXT == nTxtTyp ) OutputSectionNode( *pNd-GetSectionNode() ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index d6cbdaa..393a685 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -403,6 +403,15 @@ //section. bool bBreakSet = false; +const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False); + +if (pAktPageDesc != pPageDesc) +{ +bBreakSet = true; +bNewPageDesc = true; +pAktPageDesc = pPageDesc; +} + if ( pSet pSet-Count() ) { if ( SFX_ITEM_SET == pSet-GetItemState( RES_PAGEDESC, false, pItem ) @@ -456,7 +465,7 @@ if ( pBreak pBreak-GetBreak() == SVX_BREAK_PAGE_BEFORE ) { -bNewPageDesc = SetAktPageDescFromNode( rNd ); +bNewPageDesc |= SetAktPageDescFromNode( rNd ); } } if ( !bNewPageDesc ) -- To view, visit https://gerrit.libreoffice.org/1647 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sw unit test: layout dump must be resetted in 'reload' metho...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1643 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1643/1 sw unit test: layout dump must be resetted in 'reload' method Otherwise tests relying on layout dumps will parse the wrong dump. Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add --- M sw/qa/extras/inc/swmodeltestbase.hxx 1 file changed, 5 insertions(+), 0 deletions(-) diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 128983c..cc05b2b 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -251,6 +251,11 @@ uno::Referencelang::XComponent xComponent(xStorable, uno::UNO_QUERY); xComponent-dispose(); mxComponent = loadFromDesktop(aTempFile.GetURL()); +if (mpXmlBuffer) +{ +xmlBufferFree(mpXmlBuffer); +mpXmlBuffer = 0; +} } void finish() -- To view, visit https://gerrit.libreoffice.org/1643 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: add test case for paragraph mark export
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1650 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1650/1 docx export: add test case for paragraph mark export Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18 --- A sw/qa/extras/ooxmlexport/data/1-table-1-page.docx M sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx new file mode 100755 index 000..07d91ae --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx Binary files differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 0f99cf5..8d14409 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -35,6 +35,7 @@ #include com/sun/star/style/ParagraphAdjust.hpp #include com/sun/star/view/XSelectionSupplier.hpp #include com/sun/star/table/BorderLine2.hpp +#include com/sun/star/text/XPageCursor.hpp #include unotools/tempfile.hxx #include swmodeltestbase.hxx @@ -66,6 +67,7 @@ void testTableBorders(); void testFdo51550(); void testN789482(); +void test1Table1Page(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -104,6 +106,7 @@ {table-borders.docx, Test::testTableBorders}, {fdo51550.odt, Test::testFdo51550}, {n789482.docx, Test::testN789482}, +{1-table-1-page.docx, Test::test1Table1Page}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -494,6 +497,18 @@ getRun(xParagraph, 5, After.); } +void Test::test1Table1Page() +{ +// 2 problem for this document after export: +// - invalid sectPr inserted at the beginning of the page +// - font of empty cell is not preserved, leading to change in rows height +uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY); +uno::Referencetext::XTextViewCursorSupplier xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY); +uno::Referencetext::XPageCursor xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY); +xCursor-jumpToLastPage(); +CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); -- To view, visit https://gerrit.libreoffice.org/1650 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] doc export: add unit test for fdo#56513
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1644 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1644/1 doc export: add unit test for fdo#56513 Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304 --- A sw/qa/extras/ww8export/data/fdo56513.doc M sw/qa/extras/ww8export/ww8export.cxx 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/sw/qa/extras/ww8export/data/fdo56513.doc b/sw/qa/extras/ww8export/data/fdo56513.doc new file mode 100644 index 000..f5be1c3 --- /dev/null +++ b/sw/qa/extras/ww8export/data/fdo56513.doc Binary files differ diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index f7a8f04..7c61d95 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -42,6 +42,7 @@ void testFdo46020(); void testFirstHeaderFooter(); void testZoom(); +void test56513(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -61,6 +62,7 @@ {fdo46020.odt, Test::testFdo46020}, {first-header-footer.doc, Test::testFirstHeaderFooter}, {zoom.doc, Test::testZoom}, +{fdo56513.doc, Test::test56513}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -145,6 +147,13 @@ CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue); } +void Test::test56513() +{ +CPPUNIT_ASSERT_EQUAL(OUString(This is the header of the first section), parseDump(/root/page[1]/header/txt/text())); +CPPUNIT_ASSERT_EQUAL(OUString(This is the first page header of the second section), parseDump(/root/page[2]/header/txt/text())); +CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the second section), parseDump(/root/page[3]/header/txt/text())); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); -- To view, visit https://gerrit.libreoffice.org/1644 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: also export rPr in pPr (paragraph mark stylin...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1649 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1649/1 docx export: also export rPr in pPr (paragraph mark styling) Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863 --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b97b368..aefd172 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -442,6 +442,9 @@ { WriteCollectedParagraphProperties(); +// insert copy of rPr +m_pSerializer-copyTopMarkPop(); + m_pSerializer-endElementNS( XML_w, XML_pPr ); if ( m_nColBreakStatus == COLBRK_WRITE ) @@ -973,6 +976,9 @@ m_pSerializer-endElementNS( XML_w, XML_rPr ); +// Clone rPr.../rPr for later re-use, in pPr +m_pSerializer-copyTopMarkPush(); + // write footnotes/endnotes if we have any FootnoteEndnoteReference(); -- To view, visit https://gerrit.libreoffice.org/1649 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sax: add methods to duplicate current top marker and reapply...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1648 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1648/1 sax: add methods to duplicate current top marker and reapply it later The need for this is ooxml: we need to have a duplicate entry (rPr) like this: p pPr rPr.../rPr /pPr r rPr.../rPR /r /p This patch allows to do that by setting aside a copy of the rPr line, and then merging the copy when needed. Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5 --- M sax/inc/sax/fshelper.hxx M sax/source/tools/fastserializer.cxx M sax/source/tools/fastserializer.hxx M sax/source/tools/fshelper.cxx 4 files changed, 29 insertions(+), 0 deletions(-) diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx index b0b8b09..2e9d07b 100644 --- a/sax/inc/sax/fshelper.hxx +++ b/sax/inc/sax/fshelper.hxx @@ -142,6 +142,8 @@ void mark( ::com::sun::star::uno::Sequence sal_Int32 aOrder = ::com::sun::star::uno::Sequence sal_Int32 () ); void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND ); +void copyTopMarkPush(); +void copyTopMarkPop(); /* Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index bc2b12e..31aac1e 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -265,6 +265,20 @@ } } +void FastSaxSerializer::copyTopMarkPush() +{ +assert (!maMarkStack.empty()); +maSavedMarkStack.push(boost::shared_ptr ForMerge ( new ForMerge(*maMarkStack.top(; +} + +void FastSaxSerializer::copyTopMarkPop() +{ +assert (!maSavedMarkStack.empty()); +maMarkStack.push(maSavedMarkStack.top()); +mergeTopMarks(); +maSavedMarkStack.pop(); +} + void FastSaxSerializer::writeBytes( const Sequence ::sal_Int8 aData ) throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) { if ( maMarkStack.empty() ) diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index b80f1cc..70bc153 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -145,6 +145,8 @@ @see mark() */ void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND ); +void copyTopMarkPush(); +void copyTopMarkPop(); private: ::com::sun::star::uno::Reference ::com::sun::star::io::XOutputStream mxOutputStream; @@ -203,6 +205,7 @@ }; ::std::stack boost::shared_ptr ForMerge maMarkStack; +::std::stack boost::shared_ptr ForMerge maSavedMarkStack; void writeFastAttributeList( const ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XFastAttributeList Attribs ); void write( const ::rtl::OUString s ); diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 2f3f7bf..37cf3d0 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -162,6 +162,16 @@ mpSerializer-mergeTopMarks( eMergeType ); } +void FastSerializerHelper::copyTopMarkPush() +{ +mpSerializer-copyTopMarkPush(); +} + +void FastSerializerHelper::copyTopMarkPop() +{ +mpSerializer-copyTopMarkPop(); +} + FastAttributeList * FastSerializerHelper::createAttrList() { return new FastAttributeList( mxTokenHandler ); -- To view, visit https://gerrit.libreoffice.org/1648 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: don't apply complex font size to non-complex fo...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1454 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1454/1 docx import: don't apply complex font size to non-complex font OOXML spec says: [szCs] specifies the font size which shall be applied to all complex script characters in the contents of this run when displayed Change-Id: I0faf599e38ef5a2e2005bb6f98874639be7d8287 --- M writerfilter/source/dmapper/DomainMapper.cxx 1 file changed, 0 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1454 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0faf599e38ef5a2e2005bb6f98874639be7d8287 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: table styles and rPr/pPr tags
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1455 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/1455/1 docx import: table styles and rPr/pPr tags When importing a style with type=table, apply rPr/pPr tags content only if we're inside a tblStylePr element. Word seems to do this, and WordprocessingML reference says the only possible parent for rPr/pPr is tblStylePr (in a table style). Change-Id: I2a6c27e458e02eb6cd39defe65a415792adc6393 --- M writerfilter/source/dmapper/StyleSheetTable.cxx 1 file changed, 4 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1455 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a6c27e458e02eb6cd39defe65a415792adc6393 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: graphics relativeFrom attributes now matches im...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1342 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1342/1 docx export: graphics relativeFrom attributes now matches import code Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 32 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1342 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] office ipc: use timeout pipe feature when connecting to self
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1311 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1311/1 office ipc: use timeout pipe feature when connecting to self Prevent deadlock situation that may occur with several clients trying to connect to one soffice master, which tries to connect to itself too. Fixes issue: #33484 Change-Id: Idf933915f785c188b0d10c4f1db6967de4faaa2a --- M desktop/source/app/officeipcthread.cxx 1 file changed, 22 insertions(+), 18 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1311 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf933915f785c188b0d10c4f1db6967de4faaa2a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sal: add timeout option when using pipe in connect mode
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1310 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1310/1 sal: add timeout option when using pipe in connect mode Change-Id: I94b9edccf194e971f375853459d73c37bdb4c6a3 --- M sal/inc/osl/pipe.h M sal/inc/osl/pipe.hxx M sal/inc/osl/pipe_decl.hxx M sal/osl/unx/pipe.c M sal/osl/w32/pipe.c 5 files changed, 19 insertions(+), 19 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1310 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94b9edccf194e971f375853459d73c37bdb4c6a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] startup: allow multiple tries to connect to other soffice in...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1089 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/1089/1 startup: allow multiple tries to connect to other soffice instance On startup if new soffice instance (S2) detects another soffice (S1), S2 will starts in 'connect to soffice S1 pipe' mode. Then S2 will establish a dialog with S1. But if S1 exits before dialog establishment, S2 will fail to start and return a IPC_STATUS_BOOTSTRAP_ERROR. This patch fixes this : if dialog establishment fails, S2 will go back to the is-there-any-other-soffice-running-? step (after 3 failures, IPC_STATUS_BOOTSTRAP_ERROR is returned). Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 --- M desktop/source/app/officeipcthread.cxx 1 file changed, 36 insertions(+), 16 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1089 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
docx export: if table has no width use w:tblW 'auto' type
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: docx export: if table has no width use w:tblW 'auto' type .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I085febf04205181e7c4488bc948f346f92070fe2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: handle start/end attribute in tcBorders
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/908 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/908/1 docx import: handle start/end attribute in tcBorders Change-Id: I148345485534ae50b616857d971ef1c8b1594f28 --- M writerfilter/source/dmapper/TDefTableHandler.cxx 1 file changed, 2 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/908 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I148345485534ae50b616857d971ef1c8b1594f28 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: explicitely use 'none' type for disabled cell b...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/909 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/909/1 docx export: explicitely use 'none' type for disabled cell borders Otherwise, the table default borders will be used. Change-Id: Iebab1204dc40f79e10164e4815bbdbbe054ef144 --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 19 insertions(+), 22 deletions(-) -- To view, visit https://gerrit.libreoffice.org/909 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebab1204dc40f79e10164e4815bbdbbe054ef144 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: unit test table/cell borders export
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/910 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/910/1 docx export: unit test table/cell borders export Change-Id: Ibd651c0d027dcf8b63b9208ffdcbcfaee3165b38 --- A sw/qa/extras/ooxmlexport/data/table-borders.docx M sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2 files changed, 62 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/910 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd651c0d027dcf8b63b9208ffdcbcfaee3165b38 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] vml import: only apply width-percent attribute if it's != 0
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/775 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/775/1 vml import: only apply width-percent attribute if it's != 0 This fixes an issue with a shape defined with these attributes: mso-width-percent:0;mso-height-percent:0 and mso-width-relative:page;mso-height-relative:page; where all points were then located in (0,0) Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09 --- M oox/source/vml/vmlshape.cxx 1 file changed, 6 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/775 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Improve vml path parsing to handle repeated commands
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/774 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/774/1 Improve vml path parsing to handle repeated commands Previously commands were executed only when the parser found a new command in the stream. Some vml path commands can handle repeated set of parameters, like this : lx1,y1,x2,y2,x3,y3,x1,y1 This patch adds support for this by executing commands when required parameters count has been met. Change-Id: Iab31fd267842755b81a3e228e45a8de63505fbd0 --- M oox/source/vml/vmlformatting.cxx 1 file changed, 33 insertions(+), 22 deletions(-) -- To view, visit https://gerrit.libreoffice.org/774 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab31fd267842755b81a3e228e45a8de63505fbd0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: add unit test for 7a2be96
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/717 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/717/1 docx export: add unit test for 7a2be96 Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec --- M sw/qa/extras/ooxmlexport/ooxmlexport.cxx 1 file changed, 49 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/717 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: add table position unit test
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/715 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/715/1 docx import: add table position unit test Change-Id: I21aa721e20be4b7f9984bf6910a94a7b7bf09c7a --- A sw/qa/extras/ooxmlimport/data/n779957.docx M sw/qa/extras/ooxmlimport/ooxmlimport.cxx 2 files changed, 46 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/715 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21aa721e20be4b7f9984bf6910a94a7b7bf09c7a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: properly import table position
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/714 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/714/1 docx import: properly import table position This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 --- M writerfilter/source/dmapper/DomainMapperTableHandler.cxx 1 file changed, 11 insertions(+), 16 deletions(-) -- To view, visit https://gerrit.libreoffice.org/714 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: export default table cell margins, based on 1st...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/716 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/716/1 docx export: export default table cell margins, based on 1st cell Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e --- M sw/source/filter/ww8/docxattributeoutput.cxx M sw/source/filter/ww8/docxattributeoutput.hxx 2 files changed, 115 insertions(+), 34 deletions(-) -- To view, visit https://gerrit.libreoffice.org/716 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
docx export: export default table cell margins and borders
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: docx export: export default table cell margins and borders .. Patch Set 2: Abandoned Replaced by new patchset #713 - #718 -- To view, visit https://gerrit.libreoffice.org/656 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I49ec61ea92536f51df01aa1bfd6121e51b029441 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: always write tblInd attribute (even when equal ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/718 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/718/1 docx export: always write tblInd attribute (even when equal to 0) Otherwise when opening the docx in Office table may get misplaced. Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 5 insertions(+), 6 deletions(-) -- To view, visit https://gerrit.libreoffice.org/718 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: set table above/bottom spacing to 0
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/713 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/713/1 docx import: set table above/bottom spacing to 0 Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06 --- A sw/qa/extras/ooxmlimport/data/n779941.docx M sw/qa/extras/ooxmlimport/ooxmlimport.cxx M writerfilter/source/dmapper/DomainMapperTableHandler.cxx 3 files changed, 30 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/713 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: position table using tblInd OR tblCellMar
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/655 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/655/1 docx import: position table using tblInd OR tblCellMar Previously cell-margin was unconditionnaly used to compute table position. Office only does so on top-level tables and if tblInd is missing. Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d --- M writerfilter/inc/resourcemodel/TableManager.hxx M writerfilter/source/dmapper/DomainMapperTableHandler.cxx M writerfilter/source/dmapper/DomainMapperTableHandler.hxx M writerfilter/source/resourcemodel/resourcemodel.cxx 4 files changed, 27 insertions(+), 7 deletions(-) -- To view, visit https://gerrit.libreoffice.org/655 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: if table has no width use w:tblW 'auto' type
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/657 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/657/1 docx export: if table has no width use w:tblW 'auto' type Change-Id: I085febf04205181e7c4488bc948f346f92070fe2 --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 2 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I085febf04205181e7c4488bc948f346f92070fe2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] solaris/unobridge: prevent inlining of callVirtualMethod fun...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/595 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/595/1 solaris/unobridge: prevent inlining of callVirtualMethod function If this function get inlined, exception catching inside it won't word as expected and the whole UNO exception stuff is broken. Fixes testtools tests failure on Solaris/gcc Change-Id: I4539a96b71e5cb439a191a3b3471fdba79c6a41d --- M bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx 1 file changed, 3 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/595 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4539a96b71e5cb439a191a3b3471fdba79c6a41d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
solaris/unobridge: prevent inlining of callVirtualMethod fun...
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: solaris/unobridge: prevent inlining of callVirtualMethod function .. Patch Set 1: Abandoned My bad ; I submitted an incorrect version of the patch. Also as sberg put it on IRC : reading your commit message about exception catching reminded me about that other fix in gcc3_linux_x86-64 which was necessary to work around more agressive inlining wiht GCC [...] so I would suggest we model workarounds around agressive inlining the same for all the gcc3_* trees -- To view, visit https://gerrit.libreoffice.org/595 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4539a96b71e5cb439a191a3b3471fdba79c6a41d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice