summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-12sw: lok: use redline author for saved author fieldsDennis Francis
Without the fix author fields will expand to "Unknown author" when loading files which have author fields in them. But only update the fields when the first view joins and not for later view joins. Change-Id: I4ac3b25349b8057812c45dc8148f8b3fc3b7ca1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145317 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-01-12loplugin:fakebool (clang-cl)Stephan Bergmann
Change-Id: I8b1aa39ef008e1865e3fd529a49b10b95db1f046 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145383 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to f1c42932246dacd75345a130baee7fb6f07d9f07 - tdf#152589 Add Transtate command & settings Help page + Also add Help page for LanguageTool options + Note: DeepL service not available in Southern Hemisphere, therefore I've not tested it. Change-Id: I8a4bb01462e40113b40210b10024c59db0da293c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145366 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to 6b6ed464e1709685a0c20a7254d169c5553aa13a - tdf#129726 Insert Index and Edit Index Help pages + Merged Insert and Edit Index help pages + Deletd Edit Index help page + Refactor + Adjust links Change-Id: I01eab63177e0a2f9962878398c86ee5ec2418dcd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145269 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12tdf#129726 Add extended tips to Index Entry dialogOlivier Hallot
Change-Id: I2fe583ccac6aef7ef024b6a31cfb2cc892b8af88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145282 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Add Help button to Translate dialogOlivier Hallot
Change-Id: If7dbbd2fa58094a0b58250887a00dba364940ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145367 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Curl:CURLOPT_REDIR_PROTOCOLS(_STR): use only "https", not "http"Julien Nabet
Change-Id: If615503b598f6823d7978f12e666832c82b63ece Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145334 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-01-12tdf#152961 sw: fix layout loop on removing fly from pageMiklos Vajna
Loading the document resulted in a layout loop. This is a problem since commit cf2c070de2bafeec3b476c6bff7bb4ac87ba46db (sw layout: invalidate margins of body content when moving a fly from page, 2022-12-09), which started invalidating the content of an old page in case we remove a fly from it, because some frames calculate their margins based on the flys of the page. Fix the problem by invalidating only the table frames of those page lowers: the direct need for this invalidation comes from SwTabFrame::CalcFlyOffsets(), which is not relevant for other frames. Also, in case non-table lowers are not invalidated, then the new bugdoc loads fine, which means this fixes the new problem while keeping the old problem fixed. This assumes that non-table frames have their equivalent of SwTabFrame::CalcFlyOffsets(), which do their own invalidation, so SwPageFrame::MoveFly() doesn't have to do it. Change-Id: I807d55d077bb0e023beb66775ab68bbca2680eb5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145384 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-01-12loplugin:external (clang-cl)Stephan Bergmann
Change-Id: I09e30d3e250bad9c328688b78cf387fcdb12c2a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145382 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:unnecessaryoverride (clang-cl)Stephan Bergmann
Change-Id: Ib0f721cb0bb7ebfd3b422cfb9e93804a70e1270b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145381 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:crosscast (clang-cl)Stephan Bergmann
> winaccessibility/source/service/AccTopWindowListener.cxx(47,36): error: suspicious dynamic cross cast from 'css::accessibility::XAccessible *' to 'VCLXAccessibleComponent *' [loplugin:crosscast] > else if (auto pvclxcomponent = dynamic_cast<VCLXAccessibleComponent*>(pAccessible)) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Iee7585dd2fa0d92af3be6b89d7d08326de3d1e7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145380 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:reservedid (clang-cl)Stephan Bergmann
...after ef533553559fe09b4afab651fc692885d1acf4ed "Rudimentary support for dynamic_cast on UNO proxy objects" added those > extern "C" IMAGE_DOS_HEADER const __ImageBase; Change-Id: I4d9cf2b7617180d66a8527e0e36631f81e0fb18d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145379 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12this is never a X11SalBitmap anymoreCaolán McNamara
Change-Id: I9f645128709bce93be1c8548614b5e72e6667844 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145292 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12Resolves: tdf#107625 make ctrl+tab act like tab when tab is an input charCaolán McNamara
Change-Id: Ic3d698920fc94df1adf142e4cbab9725ae45273c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145193 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12Don't bother building the vcldemo executable for WASM unless using Qt5Tor Lillqvist
Reduces build time a bit. Sadly, we do need to build soffice.wasm also when not using Qt5, because wasm/Makefile.am in online uses its .linkdeps file. Change-Id: I48f67598050208220e63e3a0ff627f6420ff837f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145353 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-12comphelper::OCommonAccessibleComponent's XAggregation is apparently unusedStephan Bergmann
It had been using WeakAggComponentImplHelper2 ever since 2f79d5f4794ec7f076bb290702b4c9c0afb2a6c8 "initial checkin - helper for implementing an XAccessibleContext", but all the classes that derive from it (comphelper::OAccessibleComponentHelper, comphelper::OAccessibleExtendedComponentHelper, and classes that in turn derive from those) implement queryInterface (in a way not just forwarding to the base class queryInterface, as would be required for classes implementing XAggregation) rather than queryAggregation, so aggregation was broken and any delegator would be ignored when calling queryInterface on one of the derived classes. Also, without this commit but instead with a local > --- a/include/comphelper/accessiblecomponenthelper.hxx > +++ b/include/comphelper/accessiblecomponenthelper.hxx > @@ -49,6 +49,7 @@ namespace comphelper > :public ::cppu::BaseMutex > ,public OCommonAccessibleComponent_Base > { > + void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> const &) final { assert(false); } > friend class OContextEntryGuard; > private: > css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext on all of Linux, macOS, and Windows: `make check` still succeeded, and running the resulting LibreOffice with the system in some assistive technology narration mode produced audio, all without hitting that injected assert that should have fired if the XAggregation mechanism had been used after all. Change-Id: I47045824d0762a5f3de150a11576694621b163b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145330 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12sw, UpdateSections: remove not needed StateMethodMiklos Vajna
SwTextShell::GetState() doesn't handle FN_UPDATE_SECTIONS at the moment, so this is unused. Noticed by Justin at <https://gerrit.libreoffice.org/c/core/+/145281/2#message-6b432c5700d3c28284c59e507be378e59859bba2>. Change-Id: If1a95aa0f1cbe83b42f720421d345a3e12f0b97b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145346 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-01-12tdf#152717: sc: Add UItestXisco Fauli
I tried to implement this as a CppUnittest but =DDE formula returns nothing Change-Id: I4649a7842de516fc1867ddd214b323ff77f66317 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145362 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-01-12vcl: introduce a BitmapEx::DumpAsPng()Miklos Vajna
This is mostly useful for ad-hoc debugging, so you don't need to manually create an SvFileStream, a vcl::PngImageWriter & connect them, but you can step through code in the debugger and call DumpAsPng() at random code locations. The filename type is intentionally a 'const char*', so you can call DumpAsPng(0) from gdb; that would not be possible for a 'const OUString&' parameter type. Change-Id: I7e6c9bfe8410892969a1cbd1f827e2d62f409400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145361 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12tsan:lock-order-inversion in MasterPageObserverNoel Grandin
simply the initialisation using a function local static Change-Id: Ib5b42dccd69e79822b10ab357c357003b35f9d0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145340 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12tsan:lock-order-inversion in FrameworkHelperNoel Grandin
simplify initialisation using a regular mutex, which avoids the global mutex and thus a potential lock ordering issue Change-Id: Ic32afb827aa0b6aae41b8680d7f7329fbe6bc1ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145341 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12tsan:lock-order-inversion in AnimationNodeNoel Grandin
make -j 24 -rs -f /home/noel/libo-tsan/Makefile.gbuild CppunitTest_filter_svg [build CUT] filter_svg ================== WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock) (pid=1138169) Cycle in lock order graph: M0 (0x7b0c0043c8c0) => M1 (0x7b0c00459090) => M0 Mutex M1 acquired here while holding mutex M0 in main thread: /home/noel/llvm-project/compiler-rt/lib/tsan/rtl/../../sanitizer_common/sanitizer_common_interceptors.inc:4481 (cppunittester+0x9b4c2) #1 osl_acquireMutex ??:? (libuno_sal.so.3+0x783ca) namespace)::AnimationNode::setParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) animcore.cxx:? (libanimcorelo.so+0x1d34f) M1 try to lock namespace)::AnimationNode::setParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) animcore.cxx:? (libanimcorelo.so+0x33bf2) namespace)::AnimationNode::appendChild(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&) animcore.cxx:? (libanimcorelo.so+0x27312) M0 locked namespace)::AnimationNode::appendChild(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&) animcore.cxx:? (libanimcorelo.so+0x34d29) xmloff::AnimationNodeContext::AnimationNodeContext(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&, SvXMLImport&, int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, std::shared_ptr<xmloff::AnimationsImportHelperImpl> const&) animationimport.cxx:? (libxolo.so+0x338060) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) animationimport.cxx:? (libxolo.so+0x33e010) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) ??:? (libxolo.so+0x2ca188) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) ??:? (libxolo.so+0x2cb106) namespace)::Event const*) fastparser.cxx:? (libexpwraplo.so+0x4731a) sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) fastparser.cxx:? (libexpwraplo.so+0x407fa) sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) ??:? (libexpwraplo.so+0x48d08) const&) ??:? (libxolo.so+0x2c7296) SvXMLImport::parseStream(com::sun::star::xml::sax::InputSource const&) ??:? (libxolo.so+0x2c74e2) namespace)::ReadThroughComponent(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, char const*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, rtl::OUString const&, bool) sdxmlwrp.cxx:? (libsdlo.so+0x4f2088) (libsdlo.so+0x4ef8ed) #17 sd::DrawDocShell::Load(SfxMedium&) ??:? (libsdlo.so+0x5bdbeb) (libsfxlo.so+0x596b65) #19 SfxObjectShell::DoLoad(SfxMedium*) ??:? (libsfxlo.so+0x598732) SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libsfxlo.so+0x5e5222) SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libsfxlo.so+0x5e6135) 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&) frmload.cxx:? (libsfxlo.so+0x6ca8fb) 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&) frmload.cxx:? (libsfxlo.so+0x6cd749) (libfwklo.so+0x30000f) #25 framework::LoadEnv::start() loadenv.cxx:? (libfwklo.so+0x2fb828) com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, rtl::OUString const&, int, LoadEnvFeatures) loadenv.cxx:? (libfwklo.so+0x2f98d0) 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&) loadenv.cxx:? (libfwklo.so+0x2f8905) rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libfwklo.so+0x322cbf) framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libfwklo.so+0x322f11) rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libunotest.so+0x13f41) (libsubsequenttest.so+0x5fc93) std::char_traits<char16_t> >, char const*) ??:? (libsubsequenttest.so+0x60570) (libtest_filter_svg.so+0x161bd) Mutex M0 acquired here while holding mutex M1 in main thread: /home/noel/llvm-project/compiler-rt/lib/tsan/rtl/../../sanitizer_common/sanitizer_common_interceptors.inc:4481 (cppunittester+0x9b4c2) #1 osl_acquireMutex ??:? (libuno_sal.so.3+0x783ca) namespace)::AnimationNode::fireChangeListener() animcore.cxx:? (libanimcorelo.so+0x3832f) M0 try to lock namespace)::AnimationNode::fireChangeListener() animcore.cxx:? (libanimcorelo.so+0x38814) namespace)::AnimationNode::fireChangeListener() animcore.cxx:? (libanimcorelo.so+0x38814) namespace)::AnimationNode::setParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) animcore.cxx:? (libanimcorelo.so+0x1d514) namespace)::AnimationNode::setParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) animcore.cxx:? (libanimcorelo.so+0x33bf2) namespace)::AnimationNode::appendChild(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&) animcore.cxx:? (libanimcorelo.so+0x27312) M1 locked namespace)::AnimationNode::appendChild(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&) animcore.cxx:? (libanimcorelo.so+0x34d29) xmloff::AnimationNodeContext::AnimationNodeContext(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&, SvXMLImport&, int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&, std::shared_ptr<xmloff::AnimationsImportHelperImpl> const&) animationimport.cxx:? (libxolo.so+0x338060) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) animationimport.cxx:? (libxolo.so+0x33e010) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) ??:? (libxolo.so+0x2ca188) com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) ??:? (libxolo.so+0x2cb106) namespace)::Event const*) fastparser.cxx:? (libexpwraplo.so+0x4731a) sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) fastparser.cxx:? (libexpwraplo.so+0x407fa) sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) ??:? (libexpwraplo.so+0x48d08) const&) ??:? (libxolo.so+0x2c7296) SvXMLImport::parseStream(com::sun::star::xml::sax::InputSource const&) ??:? (libxolo.so+0x2c74e2) namespace)::ReadThroughComponent(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, char const*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, rtl::OUString const&, bool) sdxmlwrp.cxx:? (libsdlo.so+0x4f2088) (libsdlo.so+0x4ef8ed) #20 sd::DrawDocShell::Load(SfxMedium&) ??:? (libsdlo.so+0x5bdbeb) (libsfxlo.so+0x596b65) #22 SfxObjectShell::DoLoad(SfxMedium*) ??:? (libsfxlo.so+0x598732) SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libsfxlo.so+0x5e5222) SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libsfxlo.so+0x5e6135) 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&) frmload.cxx:? (libsfxlo.so+0x6ca8fb) 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&) frmload.cxx:? (libsfxlo.so+0x6cd749) (libfwklo.so+0x30000f) #28 framework::LoadEnv::start() loadenv.cxx:? (libfwklo.so+0x2fb828) com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, rtl::OUString const&, int, LoadEnvFeatures) loadenv.cxx:? (libfwklo.so+0x2f98d0) 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&) loadenv.cxx:? (libfwklo.so+0x2f8905) rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libfwklo.so+0x322cbf) framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libfwklo.so+0x322f11) rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ??:? (libunotest.so+0x13f41) Change-Id: Iecb3f5c1e553d8f4278c7caf7e81f6cb1f589e9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145335 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12maAlphaMask in BitmapEx should be AlphaMaskNoel Grandin
Change-Id: I12dd1881c2896ab2970a0d149048a36d1aee9c9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145243 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12drop internal support for 1-bit imagesNoel Grandin
on modern hardware, these are less efficient than regular alpha channels. Also, this greatly simplies the range of stuff that vcl needs to deal with, which will make the upcoming transparency->alpha patch easier to deal with. Enhance vcl::CreateFromData to convert incoming 1-bit data to 8-bit image. Change-Id: I35829da750029fe373d0d2911a669d10bab6ad23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145321 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12Update git submodulesShulhan
* Update dictionaries from branch 'master' to 40580c5dbb5b06fbf402b5864e736527b05cd2f5 - id: sync dictionaries to version v2.3.0 (2022.09.21) In the dictionary file we add 15773 new root words, sort them out to simplify search and update in the future. In the affix file we fix some format for Lucene. The README updated to match with upstream [1]. [1] https://github.com/shuLhan/hunspell-id Change-Id: Ie96776aba2399b90cfbc113782c720a157458bc3 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/140263 Tested-by: Aron Budea <aron.budea@collabora.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2023-01-12tdf#152425 Synchronize import and export style names mappingMike Kaganski
1. Make the mapping in StyleSheetTable::ConvertStyleName match the opposite direction mapping happening in MSWordStyles::GetWWId and ww::GetEnglishNameFromSti. Add missing styles, provide comments to clarify the process and find respective pool format ids. 2. Instead of appending " (user)" to conflicting style names, which is the method used by SwStyleNameMapper to disambiguate API names, append " (WW)", which allows to avoid unwanted merging conflicting styles. Change-Id: I47b1c7f570da6e6e21155669fdd1b77de5cc17da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145349 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-01-12tdf#152425 Make Word names unique, and use them for style ids generationMike Kaganski
Before, a style id was generated from LibreOffice name, and then the name was replaced with Word name. Given that Writer's List N maps to Word's List Bullet N, and Word's List N doesn't map to anything in Writer, this led to styles.xml having after roundtrip: <w:style w:type="paragraph" w:styleId="List5"> <w:name w:val="List Bullet 5"/> ... <w:style w:type="paragraph" w:styleId="ListBullet5"> <w:name w:val="List Bullet 5"/> So the idea is to do the following steps: 1. Collect all the exported styles (unchanged); 2. Build unique Word names for collected styles (new): a. Process all the styles that map to special Word styles first, so that their Word names don't get changed when made unique; b. Process the rest of the styles, making sure to append a sequential number after the Writer name, if a clash happens. 3. Build Style Ids from the Word names (previously Writer name could be used), also making sure they are unique. Change-Id: I9f8f254aa6ae713671234f0109b94cc72a588150 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143905 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-01-12tdf#152425 Fix order in stiName arrayMike Kaganski
Since their introduction in commit 552d05f57175ecdd0736dc257319bc30aa88d696 (INTEGRATION: CWS portlaoisefilterteam16 (1.1.2); FILE ADDED, 2003-12-09) and commit 9ba054a180fe1fcd410a2887351c2ff1fcb30847 (INTEGRATION: CWS portlaoisefilterteam16 (1.1.2); FILE ADDED, 2003-12-09), the enum sti and GetStiNames were accidentally not matching each other. commit 78284714b73a8307174c596295894e8f3951e09a (tdf#76817: fix missing heading styles assigned to outline levels in ooxml, 2016-02-04) introduced a use of ww::GetEnglishNameFromSti, and since then, the unmatched elements started to get written to DOCX styles with wrong names, like <w:style w:type="paragraph" w:styleId="List5"> <w:name w:val="List Number"/> instead of original name "List 5". Change-Id: I8888b3f117e0b7f57c2dbb90565475d529416c60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143828 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-01-12sw: rename .uno:UpdateSections command fieldsPranam Lashkari
renamed fields name in JSON to be consistent with section insertion and getter Signed-off-by: Pranam Lashkari <lpranam@collabora.com> Change-Id: Icca0be155542b7dc6df1b29e6c7d4191db8659ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145315 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit cc4f876d05837679caa8c86ffd8be8598b8f429e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145308
2023-01-12Revert "tdf#56258 svx SetOutline: convert to toggle"Justin Luth
This reverts 7.6 commit a9b666b6b839735919923d8911f7e1efe0eb87b0. This causes too many unexpected things for the user. The biggest problem is that it does not join the previous list like the other numbering does. I suppose I could fix that by first calling a UNO command that joins/turns on numbering. However, that is a bit more dangerous with outline, since it modifies spacing / numbering on all levels, and joining can unexpected skip empty paragraphs etc. So best to just always treat the button as a dropdown to indicate to the user that they are applying an outline change. For the present I decided to leave the lighted-up aspect in place, so show that the outline is in effect. In terms of removing the list, which was the main reason for the change in the first place, there are several workarounds. The user has the option to go to "more choices" and remove, or select an all-1s choice and then remove that. Using the bullets button also is an easy option since it seems less restricted than numbering. The overall risk is no different from before, except that it is easier to make those kinds of levels now that the outline button is always available on the toolbar. Change-Id: I64e13f203ae65b2d2b28560ba747ca99d1456578 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145240 Tested-by: Justin Luth <jluth@mail.com> Reviewed-by: Justin Luth <jluth@mail.com>
2023-01-11svx typo: RelplaceNumRule -> ReplaceNumRuleJustin Luth
Change-Id: Ic11fcf35a7b1a6fb15a4046300639622095ed823 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145241 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
2023-01-11sw: add a new .uno:UpdateBookmark UNO commandMiklos Vajna
It is possible to update all bookmarks (having a certain name prefix) and their contet, but one can't update the bookmark under the cursor, which is needed for Zotero citation clusters. Fix the problem by adding a new .uno:UpdateBookmark UNO command that can update the (innermost) bookmark under the current cursor. This can be implemented on top of the recently added IDocumentMarkAccess::getBookmarkFor(). The UNO command is intentionally hidden from the customize dialog since it only makes sense to invoke it from a macro / API with parameters, not interactively. Change-Id: I3e750dfb637f50716be1155a94bc986131b84f20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145351 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-01-11Use gb_EMSCRIPTEN_QTDEFS only when building with Qt5Tor Lillqvist
Move -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE to gb_EMSCRIPTEN_CPPFLAGS. Change-Id: I435a8482e9d04d9c8218926865738397e2897109 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145354 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-11Update git submodulesEike Rathke
* Update helpcontent2 from branch 'master' to f36d8f6aea8b08f63e62a98f8ef76294e7cf7cec - Adjust End and Shift+End shortcut description to reality It's the last column with data in any row, not the last cell with data in the current row. Change-Id: Ib5e719ed6b50c2c5f2b48a8d4cad8bd9f52a3cac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145355 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2023-01-11Make the "custom widgets" for the notebookbar work in COWASMTor Lillqvist
Because building for WASM for some reason doesn't use the native-code.py approach, we need to duplicate part of what that script would produce. Change-Id: Iecb200b4b0d693914f57f6f73d5025626f15dcf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145283 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-11sw lok: expose name of bookmark under cursorMiklos Vajna
It was possible to get the names of all bookmarks, but you could not get the name of the (innermost) bookmark under the current cursor. Getting the name of the current bookmark is useful for Zotero: if we already have a citation and want to insert one more, then we should turn the current citation into a citation cluster. Fix the problem by adding an API similar to what commit bb20dee2ef1b0804065e1cda2c834d257fdd90ed (sw lok: expose field type & command of fieldmark under cursor, 2023-01-05) did, but here we deal with bookmarks, not fieldmarks. Handle the actual bookmark lookup in MarkManager, such functionality looks useful outside LOK as well. Change-Id: Ic5b9b36fda243c5d7d360fa03745b3e121b67b06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145323 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-01-11fix deadlock observed on jenkinsNoel Grandin
where we are locking SolarMutex and UndoManagerHelper_Impl::m_aMutex in different orders in different code-paths, which is deadly when we call into the same class recursively. Thread 2 (Thread 0x7f5cf303b700 (LWP 22637)): (this=0x7f5cf3037cd8) at include/vcl/svapp.hxx:1373 framework::UndoManagerHelper_Impl::impl_clear() (this=0x5f90d50) at framework/source/fwe/helper/undomanagerhelper.cxx:691 holds UndoManagerHelper_Impl::m_aMutex tries to acquire SolarMutex framework::UndoManagerHelper_Impl::clear(framework::IMutexGuard&)::$_3::operator()() const (this=0x5519040) at framework/source/fwe/helper/undomanagerhelper.cxx:403 framework::UndoManagerHelper_Impl::clear(framework::IMutexGuard&)::$_3>::_M_invoke(std::_Any_data const&) (__functor=...) at /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/std_function.h:316 (this=0x5519040) at /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/std_function.h:706 namespace)::UndoManagerRequest::execute() (this=0x5519030) at framework/source/fwe/helper/undomanagerhelper.cxx:160 framework::UndoManagerHelper_Impl::impl_processRequest(std::function<void ()> const&, framework::IMutexGuard&) (this=0x5f90d50, i_request=..., i_instanceLock=...) at framework/source/fwe/helper/undomanagerhelper.cxx:490 framework::UndoManagerHelper_Impl::clear(framework::IMutexGuard&) (this=0x5f90d50, i_instanceLock=...) at framework/source/fwe/helper/undomanagerhelper.cxx:402 framework::UndoManagerHelper::clear(framework::IMutexGuard&) (this=0x5f90c38, i_instanceLock=...) at framework/source/fwe/helper/undomanagerhelper.cxx:999 at chart2/source/model/main/UndoManager.cxx:278 void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, unsigned long*, double*) (pThis=0x5f90bc8, nVtableIndex=18, pRegisterReturn=0x0, pReturnTypeRef=0xa2dac0, bSimpleReturn=true, pStack=0x7f5cf30380e0, nStack=0, pGPR=0x7f5cf30383e0, pFPR=0x7f5cf30383a0) at bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:77 cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, bridges::cpp_uno::shared::VtableSlot, _typelib_TypeDescriptionReference*, int, _typelib_MethodParameter*, void*, void**, _uno_Any**) (pThis=0x5e40ac0, aVtableSlot=..., pReturnTypeRef=0xa2dac0, nParams=0, pParams=0x0, pUnoReturn=0x0, pUnoArgs=0x0, ppUnoExc=0x7f5cf30388e0) at bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:233 pMemberDescr=0x551dd30, pReturn=0x0, pArgs=0x0, ppException=0x7f5cf30388e0) at bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:413 binaryurp::IncomingRequest::execute_throw(binaryurp::BinaryAny*, std::__debug::vector<binaryurp::BinaryAny, std::allocator<binaryurp::BinaryAny> >*) const (this=0x28a3cc0, returnValue=0x7f5cf3039040, outArguments=0x7f5cf3039008) at binaryurp/source/incomingrequest.cxx:236 (this=0x28a3cc0) at binaryurp/source/incomingrequest.cxx:79 Thread 1 (Thread 0x7f5cfd03eec0 (LWP 22302)): (this=0x7ffcdf1b1720, t=...) at include/osl/mutex.hxx:144 comphelper::OInterfaceContainerHelper3<com::sun::star::util::XModifyListener>::addInterface(com::sun::star::uno::Reference<com::sun::star::util::XModifyListener> const&) (this=0x5f90da0, rListener=...) at include/comphelper/interfacecontainer3.hxx:313 trying to acquire UndoManagerHelper_Impl::m_aMutex framework::UndoManagerHelper_Impl::addModifyListener(com::sun::star::uno::Reference<com::sun::star::util::XModifyListener> const&) (this=0x5f90d50, i_listener=...) at framework/source/fwe/helper/undomanagerhelper.cxx:286 framework::UndoManagerHelper::addModifyListener(com::sun::star::uno::Reference<com::sun::star::util::XModifyListener> const&) (this=0x5f90c38, i_listener=...) at framework/source/fwe/helper/undomanagerhelper.cxx:1047 chart::UndoManager::addModifyListener(com::sun::star::uno::Reference<com::sun::star::util::XModifyListener> const&) (this=0x5f90bc0, i_listener=...) at chart2/source/model/main/UndoManager.cxx:338 (this=0x1d470d0) at chart2/source/controller/main/UndoCommandDispatch.cxx:57 chart::CommandDispatchContainer::getDispatchForURL(com::sun::star::util::URL const&) (this=0x5f66e58, rURL=...) at chart2/source/controller/main/CommandDispatchContainer.cxx:93 chart::ChartController::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) (this=0x5f66c50, rURL=..., rTargetFrameName=...) at chart2/source/controller/main/ChartController.cxx:1055 locks SolarMutex chart::ChartController::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) () at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/instdir/program/../program/libchartcontrollerlo.so framework::DispatchProvider::implts_queryFrameDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, com::sun::star::util::URL const&, rtl::OUString const&, int) (this=0x5f5e6c0, xFrame=..., aURL=..., sTargetFrameName=..., nSearchFlags=0) at framework/source/dispatch/dispatchprovider.cxx:352 framework::DispatchProvider::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) (this=0x5f5e6c0, aURL=..., sTargetFrameName=..., nSearchFlags=0) at framework/source/dispatch/dispatchprovider.cxx:106 framework::DispatchProvider::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) () at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/instdir/program/libfwklo.so framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) (this=0x5f59ce0, aURL=..., sTargetFrameName=..., nSearchFlags=0) at framework/source/dispatch/interceptionhelper.cxx:87 framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) () at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/instdir/program/libfwklo.so namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) (this=0x5f599c0, aURL=..., sTargetFrameName=..., nSearchFlags=0) at framework/source/services/frame.cxx:2329 namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) () at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/instdir/program/libfwklo.so (this=0x5fe8b00) at svtools/source/uno/toolboxcontroller.cxx:520 (this=0x5fe8b00) at svtools/source/uno/toolboxcontroller.cxx:242 (this=0x5fdd060) at framework/source/uielement/toolbarmanager.cxx:731 framework::ToolBarManager::AsyncUpdateControllersHdl(Timer*) (this=0x5fdd060) at framework/source/uielement/toolbarmanager.cxx:2298 framework::ToolBarManager::LinkStubAsyncUpdateControllersHdl(void*, Timer*) (instance=0x5fdd060, data=0x5fdd258) at framework/source/uielement/toolbarmanager.cxx:2285 (this=0x5fdd278, data=0x5fdd258) at include/tools/link.hxx:111 vcl/source/app/timer.cxx:75 vcl/source/app/scheduler.cxx:474 vcl/inc/saltimer.hxx:54 (this=0xa1ab10, bExecuteTimers=true) at vcl/headless/svpinst.cxx:161 Change-Id: I1971d094513cc747eff44db8e2a131ad0aae1506 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145316 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-11drop unused X11SalGraphics::GetDitherPixmapCaolán McNamara
Change-Id: Ib3374242e5edd58ca5a1fa49017a1948e970e144 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145291 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11remove defunct pXRenderFormat fieldCaolán McNamara
Change-Id: Id48feeb0738bc89e9ba8580871db6e5fb307bfd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145290 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11drop newly unused codeCaolán McNamara
Change-Id: Ida062a08b656d516cededc9307bccfe8d6e16195 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145289 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11Update git submodulesAndrea Gelmini
* Update helpcontent2 from branch 'master' to e933fe90675132335452d25f4ddb01d0798f3553 - Fix typo Change-Id: I437e33f36455f4f9340051fe9d8a74d0f6d88d3e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145332 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-01-11Update git submodulesAndrea Gelmini
* Update helpcontent2 from branch 'master' to c2c2305d0e47c043696be9a9130b8f585968f764 - Fix typo Change-Id: I63f80ef205f901313d4b2c5ec54d7d4864b3cddd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145331 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-01-11use SvpSalBitmap for X11/gen alsoCaolán McNamara
and move bitmap draw/get into CairoCommon and reuse from X11CairoSalGraphicsImpl Change-Id: Ic1faf85b78a298e603279e6d318bab9240d67e77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145288 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11consider only CAIRO_CONTENT_ALPHA to be 1bitCaolán McNamara
Change-Id: I0d09207c8131297e9c95c4e146ae62d5dac77be3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145287 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11Fix types for Curl elements (update part)Julien Nabet
"CURLOPT_REDIR_PROTOCOLS_STR" has been added with Curl 7.85 so check if Curl version is 7.85 min or use the previous version "CURLOPT_REDIR_PROTOCOLS" Change-Id: Iacf6a3c37aba63d615eaa93352b098b1c9183533 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145208 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2023-01-11tdf#152905 Use "Edit Style" instead of "Modify" for consistencyRafael Lima
As discussed in the bug report, the context menu in the "Styles" sidebar is the only place where the string "Modify..." is used to edit a style, whereas other places use "Edit Style...". Hence, let's use it here as well for consistency. Change-Id: I3244da70873dc62c302baacd614f9ada2cfe5cc3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145233 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2023-01-11move GetBitCount into CairoCommonCaolán McNamara
Change-Id: I1afc900ec10a9a8f5db29400666fcc78d7bc8f48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145286 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11move more unimplemented stubs to X11CairoSalGraphicsImplCaolán McNamara
Change-Id: Ic1b4cf481e48e609c9448523e381bd1f304087a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145274 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-11CppunitTest_sw_ooxmlexport5: remove unused preTest()Miklos Vajna
This was added by accident in commit a2a2e07996a0e49164663eaec5d79481bf7bb3e0 (sw: split CppunitTest_sw_uiwriter2 into uiwriter2 and uiwriter5, 2022-03-02). Change-Id: I674e19fb454a82f0232ee828722a556197928d87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145285 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-01-11rename BitmapEx::GetAlpha to GetAlphaMaskNoel Grandin
to ease the reading of code related to an upcoming patch to convert transparency to alpha, since there is already a GetAlpha in Color. Change-Id: I1af0f8f6dd94acfe4673c8556c7aff6c20da3f7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145209 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
generated by cgit (git 2.34.1) at 2025-01-14 18:27:34 +0000