summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-11-15Missing test dependencyStephan Bergmann
Change-Id: I3df5512984efa280a0abf05e55ad8d2babc2dc55 Reviewed-on: https://gerrit.libreoffice.org/63403 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-15Make parameter parsing linear, not loopMike Kaganski
Just cleaner IMO. Change-Id: I89c0c13b8b0be55dcbc2e5536abf982d75e4034d Reviewed-on: https://gerrit.libreoffice.org/63401 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-15no more SwClient/SwModify for SwXTableColumnsBjoern Michaelsen
Change-Id: I1522cec0e01b4c9ccb4b252b8dc0a480edb22102 Reviewed-on: https://gerrit.libreoffice.org/63350 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2018-11-14sw: fix modification of ole obj native data during HTML importMiklos Vajna
It is expected that if you load an OLE2 storage (from reqif-xhtml) and you save it as ODT, the OLE2 data is not modified. This was almost the case, but we insisted on removing the OLE2 preview from the storage. Add a new flag to OleEmbeddedObject, so import filters can opt in for not modifying the OLE2 data. [ The nice situation is that we already had a test file which had a preview stream in the OLE2 storage, so we can easily assert there that the size doesn't change. ] Change-Id: I9b8b29f015dd4f2513e51a1066767218580cb5d8 Reviewed-on: https://gerrit.libreoffice.org/63381 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2018-11-14move fmtfieldCaolán McNamara
Change-Id: Ic3f4388ea2ca92d9e97d4a9e066eea07c7de79e5 Reviewed-on: https://gerrit.libreoffice.org/63363 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-14Fix typoAndrea Gelmini
Change-Id: I6761bc281a1db0aef044eb2887083920b23470c9 Reviewed-on: https://gerrit.libreoffice.org/63349 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-11-14Map VML shadow more properly to css::table::ShadowFormatStephan Bergmann
For one, CppunitTest_sw_ooxmlexport6 failed under -fsanitize=implicit-signed-integer-truncation when passing a negative ShadowFormat.ShadowWidth into a sal_uInt16 SvxShadowItem (see below). Fixing the mapping from VML shadow to ShadowFormat in ShadowModel::pushToPropMap caused ShadowModel::pushToPropMap to fail again, however, testing against 57811035 in testOuterShdw (sw/qa/extras/ooxmlexport/ooxmlexport6.cxx). fa9d574ae1656b64670fbbac64ddd85461698149 "Code changes for fdo#74107:File Corruption - Issue with outerShdw" doesn't explain how that value came about, so assume that it was just whatever value happened to be observed in LO at that time, and now adjust it accordingly. And, for another, opening sw/qa/extras/ooxmlexport/data/testOuterShdw.docx in LO now produces a green bar with red shadow at the top of the first page that better resembles the original. > editeng/source/items/frmitems.cxx:1154:18: runtime error: implicit conversion from type 'long' of value -1160 (64-bit, signed) to type 'sal_uInt16' (aka 'unsigned short') changed the value to 64376 (16-bit, unsigned) > #0 in SvxShadowItem::PutValue(com::sun::star::uno::Any const&, unsigned char) at editeng/source/items/frmitems.cxx:1154:18 (instdir/program/libeditenglo.so +0x16716ea) > #1 in BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet&, SfxItemSet const&, bool&) at sw/source/core/unocore/unoframe.cxx:759:48 (instdir/program/libswlo.so +0xba32230) > #2 in SwFrameProperties_Impl::AnyToItemSet(SwDoc*, SfxItemSet&, SfxItemSet&, bool&) at sw/source/core/unocore/unoframe.cxx:1004:19 (instdir/program/libswlo.so +0xba3cbb9) > #3 in SwXFrame::attachToRange(com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sw/source/core/unocore/unoframe.cxx:2665:20 (instdir/program/libswlo.so +0xba78d71) > #4 in SwXFrame::attach(com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sw/source/core/unocore/unoframe.cxx:3003:9 (instdir/program/libswlo.so +0xba877fa) > #5 in SwXTextFrame::attach(com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sw/source/core/unocore/unoframe.cxx:3242:15 (instdir/program/libswlo.so +0xba926a2) > #6 in SwXText::insertTextContent(com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&, com::sun::star::uno::Reference<com::sun::star::text::XTextContent> const&, unsigned char) at sw/source/core/unocore/unotext.cxx:619:15 (instdir/program/libswlo.so +0xc2dc17f) > #7 in writerfilter::dmapper::DomainMapper_Impl::PushShapeContext(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) at writerfilter/source/dmapper/DomainMapper_Impl.cxx:2330:30 (instdir/program/libwriterfilterlo.so +0x14d2953) > #8 in writerfilter::dmapper::DomainMapper::lcl_startShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) at writerfilter/source/dmapper/DomainMapper.cxx:2964:18 (instdir/program/libwriterfilterlo.so +0x132c46f) > #9 in writerfilter::LoggedStream::startShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) at writerfilter/source/dmapper/LoggedResources.cxx:151:5 (instdir/program/libwriterfilterlo.so +0x1763e70) > #10 in writerfilter::ooxml::OOXMLFastContextHandlerShape::sendShape(int) at writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1678:27 (instdir/program/libwriterfilterlo.so +0x1ad7fba) > #11 in writerfilter::ooxml::OOXMLFastContextHandlerWrapper::lcl_createFastChildContext(int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) at writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1917:63 (instdir/program/libwriterfilterlo.so +0x1ae026e) > #12 in writerfilter::ooxml::OOXMLFastContextHandler::createFastChildContext(int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) at writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:208:21 (instdir/program/libwriterfilterlo.so +0x1aa90d7) > #13 in non-virtual thunk to writerfilter::ooxml::OOXMLFastContextHandler::createFastChildContext(int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) at writerfilter/source/ooxml/OOXMLFastContextHandler.cxx (instdir/program/libwriterfilterlo.so +0x1aa9378) > #14 in (anonymous namespace)::Entity::startElement((anonymous namespace)::Event const*) at sax/source/fastparser/fastparser.cxx:439:44 (instdir/program/libexpwraplo.so +0x24df4c) > #15 in sax_fastparser::FastSaxParserImpl::callbackStartElement(unsigned char const*, unsigned char const*, unsigned char const*, int, unsigned char const**, int, unsigned char const**) at sax/source/fastparser/fastparser.cxx:1254:21 (instdir/program/libexpwraplo.so +0x249499) > #16 in (anonymous namespace)::call_callbackStartElement(void*, unsigned char const*, unsigned char const*, unsigned char const*, int, unsigned char const**, int, int, unsigned char const**) at sax/source/fastparser/fastparser.cxx:310:18 (instdir/program/libexpwraplo.so +0x240fee) > #17 in xmlParseStartTag2 at workdir/UnpackedTarball/libxml2/parser.c:9583:6 (instdir/program/libxml2.so.2 +0x6f9027) > #18 in xmlParseTryOrFinish at workdir/UnpackedTarball/libxml2/parser.c:11342:14 (instdir/program/libxml2.so.2 +0x7300dc) > #19 in xmlParseChunk__internal_alias at workdir/UnpackedTarball/libxml2/parser.c:12244:13 (instdir/program/libxml2.so.2 +0x72426a) > #20 in sax_fastparser::FastSaxParserImpl::parse() at sax/source/fastparser/fastparser.cxx:1081:25 (instdir/program/libexpwraplo.so +0x23e8e7) > #21 in sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) at sax/source/fastparser/fastparser.cxx:870:9 (instdir/program/libexpwraplo.so +0x237c3b) > #22 in sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) at sax/source/fastparser/fastparser.cxx:1377:13 (instdir/program/libexpwraplo.so +0x2528eb) > #23 in writerfilter::ooxml::OOXMLDocumentImpl::resolve(writerfilter::Stream&) at writerfilter/source/ooxml/OOXMLDocumentImpl.cxx:503:22 (instdir/program/libwriterfilterlo.so +0x1a6a8d7) > #24 in WriterFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at writerfilter/source/filter/WriterFilter.cxx:186:24 (instdir/program/libwriterfilterlo.so +0x1a272bb) > #25 in SfxObjectShell::ImportFrom(SfxMedium&, com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sfx2/source/doc/objstor.cxx:2251:34 (instdir/program/libsfxlo.so +0x38d811f) > #26 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:772:23 (instdir/program/libsfxlo.so +0x38a1299) > #27 in SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at sfx2/source/doc/sfxbasemodel.cxx:1795:36 (instdir/program/libsfxlo.so +0x3a4372e) > #28 in (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) at sfx2/source/view/frmload.cxx:688:28 (instdir/program/libsfxlo.so +0x40c49f0) > #29 in framework::LoadEnv::impl_loadContent() at framework/source/loadenv/loadenv.cxx:1149:37 (instdir/program/libfwklo.so +0x15212f1) > #30 in framework::LoadEnv::startLoading() at framework/source/loadenv/loadenv.cxx:383:20 (instdir/program/libfwklo.so +0x1511cd6) > #31 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/loadenv/loadenv.cxx:169:14 (instdir/program/libfwklo.so +0x150d988) > #32 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/services/desktop.cxx:619:12 (instdir/program/libfwklo.so +0x16705ce) > #33 in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at framework/source/services/desktop.cxx (instdir/program/libfwklo.so +0x16707da) > #34 in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at unotest/source/cpp/macros_test.cxx:50:60 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x8f1f6) > #35 in SwModelTestBase::loadURL(rtl::OUString const&, char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:762:23 (workdir/LinkTarget/CppunitTest/libtest_sw_ooxmlexport6.so +0x2460b1) > #36 in SwModelTestBase::load(rtl::OUString const&, char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:717:16 (workdir/LinkTarget/CppunitTest/libtest_sw_ooxmlexport6.so +0x2449d6) > #37 in SwModelTestBase::executeImportTest(char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:264:13 (workdir/LinkTarget/CppunitTest/libtest_sw_ooxmlexport6.so +0x2440bf) > #38 in testOuterShdw::Import() at sw/qa/extras/ooxmlexport/ooxmlexport6.cxx:924:1 (workdir/LinkTarget/CppunitTest/libtest_sw_ooxmlexport6.so +0x33cf2d) [...] Change-Id: Ib26db2f175192c8756f825128fc5b852fcc24abf Reviewed-on: https://gerrit.libreoffice.org/63355 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-14Simplify containers iterations in sw/source/core/[d-l]*Arkadiy Illarionov
Use range-based loop or replace with STL functions Change-Id: I143e9a769e1c1bb0228933a0a92150f00e3e1f20 Reviewed-on: https://gerrit.libreoffice.org/63347 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-11-14tdf#42949 Fix IWYU warnings in include/svl/*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ide75232858599c275e023c2300201090acd22307 Reviewed-on: https://gerrit.libreoffice.org/63237 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-11-14Fix parameter value in commentMike Kaganski
Change-Id: Ie10882987655463af3bec8f75a0375f55415cc07 Reviewed-on: https://gerrit.libreoffice.org/63354 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-13no more SwClient/SwModify for SwXCellBjoern Michaelsen
Change-Id: I014d3e8eed3f65e4eb09ac53c6d34886a2d1086a Reviewed-on: https://gerrit.libreoffice.org/63310 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2018-11-13uitest Writer and Calc- autocorrect options dialogZdeněk Crhonek
Change-Id: I09af4a6a2ca434c1b6cb5b22beac35368d72894f Reviewed-on: https://gerrit.libreoffice.org/63337 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-13uitest Writer - Columns dialogZdeněk Crhonek
Change-Id: I2e44fea1dcff0cebb4ebcc0eca18e4c03ac29bb2 Reviewed-on: https://gerrit.libreoffice.org/63338 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-13uitest Writer - about dialogZdeněk Crhonek
Change-Id: I97e533cff27e15233b120c5e1d9ec64c342f761b Reviewed-on: https://gerrit.libreoffice.org/63341 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-13uitest cleaningZdeněk Crhonek
Change-Id: Idea5a87b7cce40c23eada06be82524c9b45a4db5 Reviewed-on: https://gerrit.libreoffice.org/63313 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-13Fix tdf#44291. Allow saving text without byte-order mark.Martin van Zijl
Change-Id: Ib16a4f37adcb2cfb3d2af9b6af21a4b32e4ae54c Reviewed-on: https://gerrit.libreoffice.org/50388 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-13tdf#121203 DOCX import: fix loss of free-form text in date controlMiklos Vajna
Date SDT from DOCX is imported as date control since commit 3ec2d26dc2017ac4a27483febfc63328632f352d (bnc#779630 initial DOCX import of w:sdt's w:date, 2013-04-30). One detail I missed there is our date control is strict: it doesn't allow free-form text. However, DOCX date SDT has an optional ISO date, but the actual value can be free-form text. This means that importing free-form text without an ISO date is lost on import. Fix the data loss by restricting the creation of the date control: only do this if we recognize the date format or in case we have an ISO date. Otherwise just show the free-form text to avoid data loss. Change-Id: I8125bdc749954a6a1c496de74b6682744adb7680 Reviewed-on: https://gerrit.libreoffice.org/63311 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-11-12Silence -fsanitize=implicit-signed-integer-truncationStephan Bergmann
...as happens during CppunitTest_sw_ww8export (see below), by keeping nTableOffset of signed type. It is beneficial to introduce InsInt16 (internally doing the cast to sal_uInt16) instead of casting nTableOffset to sal_uInt16 at the call site, so that -fsanitize=implicit-signed-integer-truncation can still warn about bad nTableOffset values outside the sal_Int16 range being passed to InsInt16. > sw/source/filter/ww8/wrtww8.cxx:2392:34: runtime error: implicit conversion from type 'int' of value 67140 (32-bit, signed) to type 'sal_uInt16' (aka 'unsigned short') changed the value to 1604 (16-bit, unsigned) > #0 in WW8AttributeOutput::TableDefinition(std::shared_ptr<ww8::WW8TableNodeInfoInner>) at sw/source/filter/ww8/wrtww8.cxx:2392:34 (instdir/program/libmswordlo.so +0x1f12f98) > #1 in WW8AttributeOutput::TableInfoRow(std::shared_ptr<ww8::WW8TableNodeInfoInner>) at sw/source/filter/ww8/wrtww8.cxx:2058:13 (instdir/program/libmswordlo.so +0x1f06ccf) > #2 in WW8AttributeOutput::EndParagraph(std::shared_ptr<ww8::WW8TableNodeInfoInner>) at sw/source/filter/ww8/ww8atr.cxx:998:13 (instdir/program/libmswordlo.so +0x208fe56) > #3 in MSWordExportBase::OutputTextNode(SwTextNode&) at sw/source/filter/ww8/wrtw8nds.cxx:2966:22 (instdir/program/libmswordlo.so +0x1c4d259) > #4 in MSWordExportBase::OutputContentNode(SwContentNode&) at sw/source/filter/ww8/wrtw8nds.cxx:3237:13 (instdir/program/libmswordlo.so +0x1c5a3b4) > #5 in MSWordExportBase::WriteText() at sw/source/filter/ww8/wrtww8.cxx:2725:13 (instdir/program/libmswordlo.so +0x1efa992) > #6 in WW8Export::WriteMainText() at sw/source/filter/ww8/wrtww8.cxx:2845:5 (instdir/program/libmswordlo.so +0x1f2101e) > #7 in WW8Export::StoreDoc1() at sw/source/filter/ww8/wrtww8.cxx:3005:5 (instdir/program/libmswordlo.so +0x1f31acf) > #8 in WW8Export::ExportDocument_Impl() at sw/source/filter/ww8/wrtww8.cxx:3367:5 (instdir/program/libmswordlo.so +0x1f46dd2) > #9 in MSWordExportBase::ExportDocument(bool) at sw/source/filter/ww8/wrtww8.cxx:3206:19 (instdir/program/libmswordlo.so +0x1f3cbf2) > #10 in SwWW8Writer::WriteStorage() at sw/source/filter/ww8/wrtww8.cxx:3545:23 (instdir/program/libmswordlo.so +0x1f50966) > #11 in StgWriter::Write(SwPaM&, SotStorage&, rtl::OUString const*) at sw/source/filter/writer/writer.cxx:511:20 (instdir/program/libswlo.so +0xcc770c4) > #12 in Writer::Write(SwPaM&, SvStream&, rtl::OUString const*) at sw/source/filter/writer/writer.cxx:254:23 (instdir/program/libswlo.so +0xcc6cc1f) > #13 in Writer::Write(SwPaM&, SfxMedium&, rtl::OUString const*) at sw/source/filter/writer/writer.cxx:289:12 (instdir/program/libswlo.so +0xcc6e1cc) > #14 in SwWW8Writer::Write(SwPaM&, SfxMedium&, rtl::OUString const*) at sw/source/filter/ww8/wrtww8.cxx:3562:31 (instdir/program/libmswordlo.so +0x1f513ff) > #15 in SwWriter::Write(tools::SvRef<Writer> const&, rtl::OUString const*) at sw/source/filter/basflt/shellio.cxx:851:28 (instdir/program/libswlo.so +0xc56906f) > #16 in SwDocShell::ConvertTo(SfxMedium&) at sw/source/uibase/app/docsh.cxx:813:27 (instdir/program/libswlo.so +0xd038645) > #17 in SfxObjectShell::SaveTo_Impl(SfxMedium&, SfxItemSet const*) at sfx2/source/doc/objstor.cxx:1537:19 (instdir/program/libsfxlo.so +0x38c0383) > #18 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString const&, rtl::OUString const&, SfxItemSet const&) at sfx2/source/doc/objstor.cxx:2848:39 (instdir/program/libsfxlo.so +0x38ef860) > #19 in SfxObjectShell::CommonSaveAs_Impl(INetURLObject const&, rtl::OUString const&, SfxItemSet&) at sfx2/source/doc/objstor.cxx:2705:9 (instdir/program/libsfxlo.so +0x38e8e40) > #20 in SfxObjectShell::APISaveAs_Impl(rtl::OUString const&, SfxItemSet&) at sfx2/source/doc/objserv.cxx:308:19 (instdir/program/libsfxlo.so +0x38651b3) > #21 in SfxBaseModel::impl_store(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, bool) at sfx2/source/doc/sfxbasemodel.cxx:2969:46 (instdir/program/libsfxlo.so +0x3a3ae5e) > #22 in SfxBaseModel::storeToURL(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at sfx2/source/doc/sfxbasemodel.cxx:1639:13 (instdir/program/libsfxlo.so +0x3a40fa5) > #23 in SwModelTestBase::reload(char const*, char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:797:20 (workdir/LinkTarget/CppunitTest/libtest_sw_ww8export.so +0x3b3fb1) > #24 in SwModelTestBase::executeImportExportImportTest(char const*, char const*) at sw/qa/extras/inc/swmodeltestbase.hxx:283:9 (workdir/LinkTarget/CppunitTest/libtest_sw_ww8export.so +0x3b25a8) > #25 in testN760294::Import_Export_Import() at sw/qa/extras/ww8export/ww8export.cxx:133:1 (workdir/LinkTarget/CppunitTest/libtest_sw_ww8export.so +0x3c556d) [...] Change-Id: I673a96e9f7d2d1bdf40de20f3810c4986c338c93 Reviewed-on: https://gerrit.libreoffice.org/63301 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-12tdf#120115: Dont crash on Footnote/Table undo/redoBjoern Michaelsen
brown paperbag commit: - for one, we only want to use the anchor format when we dont have another one, not the other way around - also we want to update the anchor format (not the char format) when it tells us so. - finally, keep the selected Char and AnchorFormat in Sync between SwEndnoteInfo and the underlying DocumentStylePoolManager Change-Id: Ic599dc1290c4e30d1746e5eefe6fed27b0ccdfe9 Reviewed-on: https://gerrit.libreoffice.org/63249 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2018-11-12Missing test dependencyStephan Bergmann
Change-Id: I8ce7fab21cf2e6c47c955201eee87e8890b3a47a Reviewed-on: https://gerrit.libreoffice.org/63300 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-12Fix typosAndrea Gelmini
Change-Id: Ibb94b2b16afbcca84dd55ae51fde6fd27afede3a Reviewed-on: https://gerrit.libreoffice.org/63297 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-11-12tdf#120677: restore treatment of blanks in SwTextGuess::GuessMike Kaganski
Before commit 0be3db28a4db4d2c81a5cb2edd48711eec55b51b, all non-breakable spaces were converted to plain spaces in SwTextSlot::SwTextSlot (see pInf->SetText call there). The mentioned commit has changed that to allow differentiating non-breakable spaces from other types of spaces (related to the fix of tdf#115067). This broke following processing of the NBSPs when they don't fit to line, causing infinite layout loop leading to OOM. This allows to restore old behavior to not call the break iterator for NBSP by explicitly checking for it. Change-Id: I36ab06abb66bbe65a5fc542c41e816a9f20a2dcf Reviewed-on: https://gerrit.libreoffice.org/63290 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-12uitest Writer - Table properties dialogZdeněk Crhonek
Change-Id: I1706c19c9636ba43f5b64a0691c108b1b76293c2 Reviewed-on: https://gerrit.libreoffice.org/63299 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-12svx: prefix members of SdrEditViewMiklos Vajna
Change-Id: I3e27d8444c5a152ee39b9e2cc12b9df707f092b8 Reviewed-on: https://gerrit.libreoffice.org/63281 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
2018-11-12tdf#97361 Make check_bookmarks.py more pythonicHamish McIntyre-Bhatty
Keep lines within the correct length and add a little bit of whitespace to improve readability. Change-Id: I0cf26886b25079a970938b728004c96c9fa3e26f Reviewed-on: https://gerrit.libreoffice.org/61622 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-11-12tdf#97361 Make check_table.py more pythonicHamish McIntyre-Bhatty
Improve readability by inserting a little whitespace, and obeying PEP 8 (python style guide) more closely. Also remove an unused import and a few unused local variables. Change-Id: I07de686ec9b04e293bc4e0a092e5ad957cffbbba Reviewed-on: https://gerrit.libreoffice.org/61624 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-11-12tdf#97361 Make var_fields more pythonic.Hamish McIntyre-Bhatty
Use whitespace to improve readability, including indenting arguments in a more readable way Change-Id: I7cf687042fb1d4d62e8acb8277539101dc859859 Reviewed-on: https://gerrit.libreoffice.org/61626 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-11-11tdf#120703 PVS: V560 A part of conditional expression is always true/falseMike Kaganski
Change-Id: I08ea67c1b51ee04258ce7769bfe9d97a1cb46b22 Reviewed-on: https://gerrit.libreoffice.org/63268 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-11tdf#120703 PVS: V560 A part of conditional expression is always true/falseMike Kaganski
Change-Id: I1027242192dfd2be4918094d59f2a8f8c8fec041 Reviewed-on: https://gerrit.libreoffice.org/63266 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-11Removed repeated semicolonAndrea Gelmini
Change-Id: Iefc820a4c4bb87fe113f97b085d8e89f30ff2db5 Reviewed-on: https://gerrit.libreoffice.org/63261 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2018-11-11NB Tabbed Table: remove separator in writer NBandreas kainz
Change-Id: I7a6c1e452897db1a2bd9820cf681e883ae71bb5b Reviewed-on: https://gerrit.libreoffice.org/63257 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-11-10clang-tidy: (WIP) bugprone-too-small-loop-variable findings 2Tamás Zolnai
Change-Id: I1ddf3fe0e5fad265ae14712a23469b684253079d Reviewed-on: https://gerrit.libreoffice.org/63241 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-11-10Fix typo in commentMatteo Casalin
Change-Id: I4a3614461740bc921ef99d71e2d057f5a17a75a9
2018-11-10Avoid temporary (that introduces downcast)Matteo Casalin
Change-Id: I810172d045860f49819b9e25de8a2d5fe5f80dd8
2018-11-10Use indexOf instead of getTokenCount for simple checkMatteo Casalin
Change-Id: Ic5397601267f1953379a13a3e1ac69813d363045
2018-11-10Avoid getTokenCount()Matteo Casalin
Change-Id: I769660ab1832e76ed7ac272d0d2c973d14171c06
2018-11-10tdf#120703 PVS: V547 Expression is always true/falseMike Kaganski
Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643 Reviewed-on: https://gerrit.libreoffice.org/63235 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-10tdf#120703 PVS: check proper pointer (possible nullprt dereference)Mike Kaganski
V547 Expression 'pFormat' is always true. Change-Id: I11a32f903a08296fb9e6732032b7c7f00cb8aced Reviewed-on: https://gerrit.libreoffice.org/63233 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-10tdf#120703 PVS: V547 Expression 'bRet' is always trueMike Kaganski
Change-Id: I637ba12d0c1b7baa8f7f4be456e6101594eb934a Reviewed-on: https://gerrit.libreoffice.org/63227 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-10Replace deprecated boost::optional::reset(val) with operator =Mike Kaganski
Change-Id: I7340a561e0df0c781fd834388deb4b9f83800f9b Reviewed-on: https://gerrit.libreoffice.org/63221 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-11-10Tabbed NB: sync home/text tabandreas kainz
Change-Id: I1d13f22325679f17ddef231991ecb0e199f00c50 Reviewed-on: https://gerrit.libreoffice.org/63223 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-11-09loplugin:singlevalfields in swNoel Grandin
Change-Id: Icdb155f9fa7ae79fc193c2da436d9500e7be4d29 Reviewed-on: https://gerrit.libreoffice.org/63126 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-11-09Do produce messagte catalogs for sw, too, for iOS, when necessaryTor Lillqvist
Change-Id: I9d22b44e6a835819ad32d1402a0d84ed2e465a73
2018-11-09tdf#119581 add FormatPaintbrush to text and table popupmenuandreas kainz
Change-Id: Ic88248078cb34a590396a84dd733818108d9dce4 Reviewed-on: https://gerrit.libreoffice.org/63124 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-11-09Fix many Java subsequentcheck test by using JUHJan-Marek Glogowski
Splits gb_JunitTest_set_unoapi_test_class_and_jars into two separate defines as: - gb_JunitTest_use_unoapi_jars - gb_JunitTest_use_unoapi_test_class Then replaces many of the gb_JunitTest_use_jars lists with the new gb_JunitTest_use_unoapi_jars to fix the JUH dependencies. This probably adds some unneeded JUH dependencies to some Java tests, but that shouldn't be a problem. Change-Id: I0c4fce6b50f7c6eb8d62bfb2c50f056b97584794 Reviewed-on: https://gerrit.libreoffice.org/63119 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-11-09Simplify and fix Java UNO API test makefilesJan-Marek Glogowski
Originally I just wanted to add the juh.jar to the list of jars of the UNO API tests, but this became tedious work, so after the first few files I decided to replace the similiar makefiles with a common define for the *_unoapi* tests. This patch adds two new make defines to be used used by Java UNO and UNO API tests: - gb_JunitTest_set_unoapi_test_defaults - gb_JunitTest_set_unoapi_test_class_and_jars The first one will deduce most defaults from the test name, but still allows to optionally override most settings. If a test doesn't match the default at all, the 2nd define still shares the common jar files and the main Java UNO class, so the second define adds these to your makefile. The real fix is to add juh.jar to gb_JunitTest_use_jars. Change-Id: I4342fdac5e31f85ea18fb4268e13c287a7adc2b7 Reviewed-on: https://gerrit.libreoffice.org/63118 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-11-09loplugin:useuniqueptr in SwDoc::GetRowHeight and GetRowSplitNoel Grandin
fixing a memory leak in the process Change-Id: I1b168159a8aa23e392768c49127f42b72e1ce3b3 Reviewed-on: https://gerrit.libreoffice.org/63128 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-11-08uitest Writer Text to table dialogZdeněk Crhonek
Change-Id: I0c28174d24cc626ebdab647844c711fc2be51fe8 Reviewed-on: https://gerrit.libreoffice.org/63110 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2018-11-08More --enable-debug --disable-assert-always-abort fixesStephan Bergmann
...which <https://ci.libreoffice.org/job/lo_tb_random_config_linux/> occasionally stumbles across Change-Id: I2f28fda7522b2f6b009fc2b64766ec9e43c1ab67 Reviewed-on: https://gerrit.libreoffice.org/63067 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-08Convert FieldUnit to scoped enumMike Kaganski
Change-Id: Id2df31daa596a18c79af5fc6ea162deb6e24d5af Reviewed-on: https://gerrit.libreoffice.org/62958 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>