sw/qa/extras/rtfimport/rtfimport.cxx | 2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 3972cd911b9e8dcce5aa07aa58dbbe5f83451659 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 25 15:08:47 2014 +0100 ambiguity Change-Id: Id0e3a969ff282673efd874980c25570b7ea1087b (cherry picked from commit 9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 099bb0b..9504027 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1396,7 +1396,7 @@ DECLARE_RTFIMPORT_TEST(testNestedTable, "rhbz1065629.rtf") getProperty<table::BorderLine2>(xCell, "TopBorder")); CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid, getProperty<table::BorderLine2>(xCell, "BottomBorder")); - CPPUNIT_ASSERT_EQUAL(0xCC0000, getProperty<sal_Int32>(xCell, "BackColor")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0xCC0000), getProperty<sal_Int32>(xCell, "BackColor")); xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY); CPPUNIT_ASSERT(xCell.is()); table::BorderLine2 halfPtSolid( commit eda7155b2b945f844204b6a15355ab0e04fee2cc Author: Michael Stahl <mst...@redhat.com> Date: Tue Feb 25 16:47:49 2014 +0100 writerfilter: attempt to appease Mac tinderboxes Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb (cherry picked from commit f7e1e0243318743f18b6cc6a87b7307e357f953f) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 78e4ee3..d5e7843 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2020,7 +2020,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } m_aTableBufferStack.pop_back(); m_aTableBufferStack.back().push_back( - Buf_t(BUFFER_NESTROW, 0, pBuffer)); + Buf_t(BUFFER_NESTROW, RTFValue::Pointer_t(), pBuffer)); m_aNestedTableCellsSprms.clear(); m_aNestedTableCellsAttributes.clear(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits