summaryrefslogtreecommitdiff
path: root/configmgr
AgeCommit message (Collapse)Author
2024-08-27Related: tdf#161599 ChildAccess::asValue() must return Reference<XInterface>Eike Rathke
... otherwise the unotools/source/config/configitem.cxx ConfigItem::impl_packLocalizedProperties() checking for (getValueTypeName() == "com.sun.star.uno.XInterface") would not hit and thus not pack the properties, returning just the useless XWeak pointer as property. This in ScUnoAddInCollection::ReadConfiguration() lead to English names not being extracted from configured Add-Ins' DisplayName or CompatibilityName, nor any CompatibilityName added to the list. Fallout from commit bc70f674c2487ad826f8fe04e626de1829f5b40d CommitDate: Sun Jun 18 08:41:27 2023 +0200 Use getXWeak in configmgr Change-Id: Ibaab8c08a06113b27ceffe1c45ef548c1d6fa225 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172476 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2024-07-25Keep around a single configmgr::Components::WriteThread instanceStephan Bergmann
...instead of joining and later re-spawning one. This helps with the current Emscripten setup (see 5b1df7709d75c6dd993da5a272e7e37e55a70174 "Document the Emscripten threads issue"), and probably doesn't matter much either way on other platforms (so just get it in unconditionally). (Renaming the delay_ member variable to delayOrTerminate_, to make its overall role more clear.) (I ran into this when trying to turn the Emscripten build from starting up with a Writer document to starting up with the start center, and then manually opening a new Writer document. The resulting different usage scheme happened to exhaust our current -sPTHREAD_POOL_SIZE=4 pool quickly, so this is one of multiple commits to address that.) Change-Id: I1bd28604b4640d2afad982bfd82b1acee8200e26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170993 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins
2024-07-24Remove bExitWasCalled-handling from confgimgr::Components dtorStephan Bergmann
That code had been added with 9fa4eff9be5e440099517a522a83e20debaf2955 "profilesafe: Enhancements to BackupFileHelper", but it looks dubious: For one, I cannot find proof for the claim that MSVC would run destructors of static objects upon _exit. Building a simple C++ test program > #include <iostream> > #include <stdlib.h> > struct S { ~S() { std::cerr << "hello\n"; } }; > S s; > void f() { _exit(1); } > int main() { f(); } with contemporary MSVC 17.10 and executing it shows no "hello" stderr output (see <https://gcc.godbolt.org/#g:!((g:!((g:!((h:codeEditor,i:(filename:'1',fontScale:14,fontUsePx:'0',j:1,lang:c%2B%2B,selection:(endColumn:13,endLineNumber:5,positionColumn:13,positionLineNumber:5,selectionStartColumn:13,selectionStartLineNumber:5,startColumn:13,startLineNumber:5),source:'%23include+%3Ciostream%3E%0A%23include+%3Cstdlib.h%3E%0Astruct+S+%7B+~S()+%7B+std::cerr+%3C%3C+%22hello%5Cn%22%3B+%7D+%7D%3B%0AS+s%3B%0Avoid+f()+%7B+_exit(1)%3B+%7D%0Aint+main()+%7B+f()%3B+%7D%0A'),l:'5',n:'1',o:'C%2B%2B+source+%231',t:'0')),k:32.19670284753087,l:'4',m:100,n:'0',o:'',s:0,t:'0'),(g:!((h:compiler,i:(compiler:vcpp_v19_40_VS17_10_x64,filters:(b:'0',binary:'1',binaryObject:'1',commentOnly:'0',debugCalls:'1',demangle:'0',directives:'0',execute:'0',intel:'0',libraryCode:'0',trim:'1',verboseDemangling:'0'),flagsViewOpen:'1',fontScale:14,fontUsePx:'0',j:1,lang:c%2B%2B,libs:!(),options:'',overrides:!(),selection:(endColumn:1,endLineNumber:1,positionColumn:1,positionLineNumber:1,selectionStartColumn:1,selectionStartLineNumber:1,startColumn:1,startLineNumber:1),source:1),l:'5',n:'0',o:'+x64+msvc+v19.40+VS17.10+(Editor+%231)',t:'0'),(h:output,i:(compilerName:'x86-64+clang+18.1.0',editorid:1,fontScale:14,fontUsePx:'0',j:1,wrap:'1'),l:'5',n:'0',o:'Output+of+x64+msvc+v19.40+VS17.10+(Compiler+%231)',t:'0')),k:67.80329715246913,l:'4',m:100.00000000000001,n:'0',o:'',s:1,t:'0')),l:'2',n:'0',o:'',t:'0')),version:4>). If there indeed were issues with MSVC and non-standard _exit, a solution might be to use standard _Exit instead (in FatalError in desktop/source/app/app.cxx). And for another, when bExitWasCalled was true in configmgr::Components::~Components, it would still have called writeThread_->join() (i.e., it would potentially still have called writeModFile from within configmgr::Components::WriteThread::execute()), but (a) only after waiting out its full > delay_.wait(std::chrono::seconds(1)); (because it missed to call configmgr::Components::WriteThread::flush, which calls delay_.set()), and (b) potentially running into a deadlock because it called writeThread_->join() with *lock_ locked, which configmgr::Components::WriteThread::execute wants to lock too. (I came across this because it got into my way when trying to adapt the lifecycle of configmgr::Components::WriteThread to the needs of the Emscripten build.) Change-Id: Icb4ebf00d1d316b80c29f7bd91b86614ef4ac430 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170940 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-07-14Revert "boost::unordered_map to std::unordered_map in configmgr::Partial"Stephan Bergmann
This reverts commit 154b2040102d74aeb4c5d0cf07f1bdc90d265d52, which is known broken, as (unlike for boost::unordered_map) there is no guarantee that std::unordered_map works for incomplete value types, and indeed there is build environments that started to fail now with > In file included from /home/libo/src/core/configmgr/source/partial.cxx:23: > In file included from /usr/lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/set:60: > In file included from /usr/lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/stl_tree.h:63: > In file included from /usr/lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/stl_algobase.h:64: > /usr/lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/stl_pair.h:218:11: error: field has incomplete type 'configmgr::Partial::Node' > _T2 second; ///< The second member > ^ [...] Change-Id: Ie8d041bcf3d3b1b6aeede73adbaf14676250c4bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170467 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-07-13boost::unordered_map to std::unordered_map in configmgr::PartialNoel Grandin
Change-Id: I030a175af694d1e0025ac2c047141913b08c3be4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170395 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
2024-05-10no need to convert from Sequence to std::set hereNoel Grandin
we are never actually going to need a set, so just iterate over the Sequence Change-Id: I0de6ff9e0661227a69b7fbe6cccc5268f9eba58f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167430 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-05-07loplugin:ostr in configmgrNoel Grandin
Change-Id: If1caaee8e54b5861e1435e900b3ae7bd90ecae5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167237 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
2024-05-04speedup configmgr::Access on WindowsNoel Grandin
std::multiset seems to be pretty slow to construct and destruct, even if we ~never put anything into these listener lists, so rather use o3tl::sorted_vector, which has more predictable performance. Shaves 10% off startup time for me. Change-Id: I13afcbe3cb63522e4efe61c64f773e1ffbec9683 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167101 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-03-22configmgr: fix parse error if subelements of <info> usedMichael Stahl
The unused but valid child elements of <info> such as <author> may be used by exentions. This fails with: warn:configmgr:15104:10916:configmgr/source/components.cxx:660: error reading "file:///instdir/program/../share/uno_packages/cache/uno_packages/....xcs" com.sun.star.uno.RuntimeException message: "bad member <component> in ....xcs at configmgr/source/xcsparser.cxx:289" Because ending the first such element sets bIsParsingInfo_ to false. This fix just concatenates all the characters in all the children, should work well enough for extensions. (regression from commit db3078bd8c8e3ce3a99fc3987bb6e93b609990c1) Change-Id: I17a3fb7014cd34c1d546701036550085365432a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165143 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-03-09Support o3tl::iterateCodePoints with both sal_Int32 and std::size_tStephan Bergmann
...and clean up the most gross casting offenses Change-Id: If0d646fb3e73e71a9a2735569395034973563a1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164602 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-03-08use more string_viewNoel Grandin
found by tweaking the stringview loplugin Change-Id: I92203ba99642bef7951ffa146184c5562cb31d09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163744 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-02-06Fix placement of commentsStephan Bergmann
...which each pertain to all the preceding code that extracts numbers from strings, and where 0a5d4dc25c5521de221f63dbc47c6ba79a51f8fb "elide some OString temporaries" had changed that preceding code from stretching over a single to stretching over multiple statements each Change-Id: I315187465d64f620b1ddea8a0cc74ed5f8dc113b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163063 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-02-06elide some OString temporariesNoel Grandin
Change-Id: I2ecb6af11c95605c84e935b850fe94a1831a1497 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163043 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-02-05reduce unnecessary OString temporariesNoel Grandin
spotted while profiling tdf#108037 Change-Id: I66afa79d7da94c1d3c7d1695ce9c5cf902e1429e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163002 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-01-27Drop std::as_const from css::uno::Sequence iterationsMike Kaganski
Obsoleted by commit 2484de6728bd11bb7949003d112f1ece2223c7a1 (Remove non-const Sequence::begin()/end() in internal code, 2021-10-15) and commit fb3c04bd1930eedacd406874e1a285d62bbf27d9 (Drop non-const Sequence::operator[] in internal code, 2021-11-05). Change-Id: Idbafef5d34c0d4771cbbf75b9db9712e504164cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162640 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-12-19tdf#158593 Make configmgr READONLY Property more usefulStephan Bergmann
...to reflect whether or not the corresponding item can be modified. Which matches what the READONLY flag is actually used for today. (And the original, somewhat arbitrary semantics had been assigned without much thought, IIRC, and it should be OK to change them.) Change-Id: I8185e47519a5cb4aff6e8f260326845276b0c092 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160957 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-12-09cid#1558833 Uninitialized scalar fieldCaolán McNamara
Change-Id: I8c617c20f725f4277a0c4d637be336c6624c3238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160513 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-12-07tdf#157432 Expert config: Allow filtering by changed valuesSamuel Mehrbrodt
Change-Id: Ib8bbb7fc9e8014a9367278f3fa640f53af46dd2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159986 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-11-26Simplify implementation of getTypeByHierarchicalNameStephan Bergmann
(Localized)PropertyType::getStaticType already provides the relevant information Change-Id: I5aceb596ac4a2d111ebcb5ddef7ef74c80762047 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159969 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-11-25Simplify description/type parsing a bitStephan Bergmann
...it only pertains to property nodes Change-Id: I706e14118e3f8c33190821f9bcce81bd60d665e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159953 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-11-21asan: fix read of uninitialised valueNoel Grandin
ever since commit a91892ec4942fc875820ea02dfbe74e986548142 Author: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Date: Thu Nov 16 13:56:06 2023 +0100 Use existing types, instead of strings Change-Id: Ifb7af17d21a32fdf411854b6820b32d1767660e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159779 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-20Use existing types, instead of stringsSamuel Mehrbrodt
as suggested in https://gerrit.libreoffice.org/c/core/+/158028/comments/b7a803f4_7e5899ca Change-Id: I7d4c46b24307922b51e463bacdfacfca85956b80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159524 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-11-20Extended loplugin:ostr: configmgrStephan Bergmann
Change-Id: If9cc1f0c18a5fa344a433b338f81d191340e70f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159722 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-11-09Use proper type in expert config dialogSamuel Mehrbrodt
In preparation for proper editing support for the different types. Change-Id: I7044ff100c9bfcca5fa8894ff4525a1aac692796 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158028 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-11-09tdf#157431 Show description for expert config itemsSamuel Mehrbrodt
Change-Id: I7d0257c2e06ed384f90ca3b51a6d2549044f2cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157148 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-10-31reduce ref-counting traffic in configmgrNoel Grandin
we can return by const& from getNode Change-Id: If93c43fd2e910e2fb69d9bd0a9e3dc587133dfa8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158729 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-10-31reduce reference counting traffic in configmgrNoel Grandin
no need to construct a vector when iterating over children Change-Id: I717e92be3c576a6e5d877f4333264a5bed9daadf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158728 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-10-19Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: configmgrStephan Bergmann
Change-Id: Id95245a309b3baa80d7cca63d980aa0657fb9eb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158148 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-08-31SAL_WARN->SAL_INFO in Access::getChildNoel Grandin
reduce log noise Change-Id: I95393f18fe8cc019c89ad4779d5b10f64993bd51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156340 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-07-18Make sure that root listeners are notified firstMike Kaganski
The problem appeared when in a configuration listener's changesOccurred, a configuration value was read using officecfg machinery, which could return the old value of the configuration, or an updated one, at random. This was caused by use of a cached value in comphelper::detail::ConfigurationWrapper::getPropertyValue, which is cleaned in ConfigurationChangesListener::changesOccurred; but the order in which the listeners' changesOccurred methods were called depended on the implementation detail of configmgr::Components::roots_, which was previously a std::set of pointers, and now is a sorted vector. This made the pointers sorted in order of the pointers' addresses (basically random), and when a broadcaster's common list of change listeners was prepared in Components::initGlobalBroadcaster, ConfigurationWrapper's listener could arrive last. This meant, that the cache could be cleaned too late, after its obsolete content was already used in a previous listener. The problem could be partially mitigated by clearing the cache in the comphelper::detail::ConfigurationWrapper::setPropertyValue, but that would only handle cases of config modifications using comphelper. Instead, take into account that ConfigurationWrapper listens on the root of configuration tree; and introduce a separate container in configmgr::Broadcaster for root listeners. They would be triggered first, before all other listeners. Still, this would not guarantee the proper order, if another listener is registered on root. To handle all cases, a special listener category could be used, which could be filled using a dedicated internal API, so comphelper could use it to register its privileged listener close to the heart of the broadcaster :) This might be implemented later. Change-Id: I956b7989b3927dca2683f63cf92b0dda04db9bdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154561 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-06-18Use getXWeak in configmgrMike Kaganski
Change-Id: Ia7d9475cecd2208ccf672f2b35c0c841fed7f4dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150840 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-05-25merge some stringaddsNoel Grandin
found with a lightly tweaked version of the loplugin:stringadd and some hand-holding. Change-Id: I146aadcaf665e98fea89a9cad2df4dc3935622f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152275 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-24Fix CppunitTest_configmgr_unit for --disable-report-builderStephan Bergmann
...after abd630e81bc150d05e4129cc22752ecf461777c7 "Allow all hierarchical path segments to be ['...'] quoted", which failed as the checked MimeTypeClassIDRelations group is conditional on install:module="reportbuilder". (See the comments at <https://gerrit.libreoffice.org/c/core/+/151673/2#message-f029dd1877f8a946647456ed73a7b60f6dfc0e8f> "Allow all hierarchical path segments to be ['...'] quoted".) It looks like there is no other, non-conditional property with a slash in its name, so the test now just tests the ['...'] syntax on an otherwise unproblematic property name. (Alternatively, we could have extended the configuration data used by unit tests with such a problematicaly named property.) Change-Id: I820004a5b824326d86e67c158994f13e71ba135e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152184 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-05-11Allow all hierarchical path segments to be ['...'] quotedStephan Bergmann
...and not just set elements. <https://gerrit.libreoffice.org/c/core/+/151660> "tdf#104005 Don't allow changing finalized properties" found that some existing property names include "/", which makes them unusable with e.g. getPropertyByHierarchicalName. The most obvious solution is to allow ['...'] quoting (without a leading template name, though) for all kinds of hierarchical path segments. (In theory, that would cause backwards incompatibility, as e.g. a property named ['foo'] could no longer be referenced by a ['foo'] path segment (it would need to be referenced by a ['[&apos;foo&apos;]'] path segment instead). But in practice, that path segment ['foo'] would have been rejected in the past anyway, as it did not reference a set element.) To make this work, the meaning of the setElement out-parameter of configmgr::Data::parseSegment is changed to only be true if the segment uses ['...'] notation including a leading (non-empty) template name. What this change does not (yet) address is writing out such quoted (group or set) names in the hierarchical paths written out in configmgr::writeModFile, where necessary. (It never writes out names of properties as parts of hierarchical names, so this wouldn't be an issue for the existing problematic properties containing "/" in their names, anyway.) Change-Id: I635d823c7bbb6b8ac5869c7e0130ba8cfd329599 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151673 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-04-28optimise find/insert calls to mapsNoel Grandin
Instead of doing two lookups, we can just call insert and then update the mapped-to value if the insert actually succeeded. Change-Id: I3df3b98f0debe6bf74c739dd5850e7714d9c2789 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151030 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-04-18Some missing XServiceInfo implementationsStephan Bergmann
Change-Id: I1cf871b40f9f4020147dac0456ebeed3de0438e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150533 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-03-24loplugin:stringadd in c*Noel Grandin
after my patch to merge the bufferadd loplugin into stringadd Change-Id: I66f4ce2fd87c1e12eefb14406e0e17212f68ceff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149497 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-16tdf#143148: Use pragma once instead of include guardsUday Sharma
Change-Id: I6898acbf7c6c9de45bbfa6a32202acf302f92caa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146822 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2023-03-15Bump dconf minimum version requirementStephan Bergmann
At least building on Fedora 37 with dconf-devel-0.40.0-7.fc37.x86_64 against recent LLVM 17 trunk libc++ started to fail now with > In file included from configmgr/source/dconf.cxx:25: > In file included from /usr/include/dconf/dconf.h:23: > In file included from /usr/include/dconf/common/dconf-enums.h:23: > In file included from /usr/include/glib-2.0/glib.h:34: > In file included from /usr/include/glib-2.0/glib/gasyncqueue.h:34: > In file included from /usr/include/glib-2.0/glib/gthread.h:34: > In file included from /usr/include/glib-2.0/glib/gatomic.h:30: > In file included from /usr/include/glib-2.0/glib/glib-typeof.h:44: > In file included from ~/llvm/inst/bin/../include/c++/v1/type_traits:430: > ~/llvm/inst/bin/../include/c++/v1/__type_traits/aligned_union.h:23:1: error: templates must have C++ linkage > template <size_t _I0, size_t ..._In> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > configmgr/source/dconf.cxx:19:1: note: extern "C" language linkage specification begins here > extern "C" { > ^ because the missing extern "C" has meanwhile been added to upstream dconf with <https://gitlab.gnome.org/GNOME/dconf/-/commit/f860ddcc6a501b982d82c5630c73936bd611ad8a> "common: Add missing G_BEGIN/END_DECLS" towards tag 0.40.0. So the easiest fix here appears to be to bump our requirements to that dconf version 0.40.0: The one case I'm aware of that explicitly wants dconf support is downstream Fedora and RHEL builds, which already have dconf 0.40.0 (cf. most recent <https://src.fedoraproject.org/rpms/dconf/blob/a9987b0abe15133d091bcd390fd33077881567ae/f/dconf.spec#_4> for f37 and most recent <https://gitlab.com/redhat/centos-stream/rpms/dconf/-/blob/1bb6b46da242b75e5e1864f5c97ab6e592ca60ba/dconf.spec#L4> for e9s). On the other hand, the TDF Linux release builds are done with an explicit --disable-dconf in distro-configs/LibreOfficeLinux.conf (since ecc617e797aa5ed329668114e54ec7ffa5c0e87b "configmgr: support reading from a dconf layer (WIP)") and the Flatpak builds on Flathub are done against an org.freedesktop.Sdk//22.08 where no dconf support is detected at all (for the most recent LO 7.5.1 build on Flathub see > checking for DCONF... no > checking whether to enable dconf... no at <https://buildbot.flathub.org/#/builders/5/builds/3184/steps/8/logs/stdio> for aarch64 and at <https://buildbot.flathub.org/#/builders/5/builds/3184/steps/8/logs/stdio> for x86_64). Change-Id: I559d2ac8712dbe2b40c9b881314b88d1cc8eaf43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148887 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-23unlock during dispose in configmgr::configuration_provider::ServiceNoel Grandin
Since the code that can run during flushModifications might manage to call back into Service.. regression from commit a61951a3a21c6457334f78f657806c1167dbf339 Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Mon Feb 20 20:08:30 2023 +0200 BaseMutex->std::mutex in configmgr::configuration_provider::Service Change-Id: I0070e7589cdea38905de6c68adefd8081b122152 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147500 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-21fix locking in configmgr::configuration_provider::ServiceNoel Grandin
a mistake from commit a61951a3a21c6457334f78f657806c1167dbf339 Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Mon Feb 20 20:08:30 2023 +0200 BaseMutex->std::mutex in configmgr::configuration_provider::Service Change-Id: I59c670ea7bffacb9dcd1f073b5da2439c2102a45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147392 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-21BaseMutex->std::mutex in configmgr::configuration_provider::ServiceNoel Grandin
Change-Id: Ie8f7cb4cd91ac0089365a691f07962a26d51a72a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147377 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-17Verify that zh-Hant-TW locale works in configmgr as intendedStephan Bergmann
...after b52117c0be97c45824d2897657084f8ac7e9bf42 "Try an override locale as first fallback" Change-Id: I23d8459fff4d76fd9d542d098953bf97cf5397a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147219 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-17Verify that es-419 locale works in configmgr as intendedStephan Bergmann
...after a9b97301ba75a74e6671a6b9829f7044e85db6af "Do not add empty language tag to fallback strings" Change-Id: Ie42929c2ce6331012358f72026ae774b9dd0e369 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147207 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-17Try an override locale as first fallbackEike Rathke
Change-Id: I4ca6db43fef2706c4c1bab020e2170f6cf45a441 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147184 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2023-02-16Do not add empty language tag to fallback stringsEike Rathke
This happened for known tags like es-419 but unhandled in simpleExtract(), which actually should be implemented as now a few are mapped as known tags. Prevent adding such empty string. For that, adjust configmgr/qa/unit/test.cxx to test for the expected "en-US" instead of "default". Change-Id: I05f8e35a9d88b42d45e1f2a90aecec5f4470cc79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147135 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2023-02-16Improve testLocalizedPropertyStephan Bergmann
c3bd52f81bf733a0b9b0560794a54b2ac1e0f444 "Use the (first segment of the) original locale value for the workaround again" had stated: "The added test code unfortunately doesn't actually test this piece of code, and somewhat unexpectedly receives the "default" value from the empty string locale default, rather than the "en-US" value from the higher precedence "en-US" locale default, because `aFallbacks` happens to contain an empty string, so we already leave Access::getChild early in the 'Find the best match using the LanguageTag fallback mechanism, excluding the original tag' block." But, of course, the relevant code can well be tested after all, using a localized property that does not have a default no-xml:lang value. (And add a TODO comment about the unexpected "default" vs. "en-US" in the original test code, in case the LanguageTag::getFallbackStrings behavior ever changes and the test starts to fail.) Change-Id: I526a830a5929b6b5ad17ba57af5943954b07b86a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147137 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-15Use the (first segment of the) original locale value for the workaround againStephan Bergmann
cf7c9599e776eba8e14614cecb528d3da5778190 "Make comphelper/configuration.hxx work for localized properties", which had originally introduced this code, had been careful to ensure that the > assert( > !locale.isEmpty() && locale.indexOf('-') == -1 && > locale.indexOf('_') == -1); would always hold here (it had already removed all trailing "-..." and "_..." segments, but had made sure to stop before `locale`, which is known to initially be no non-empty, would have become empty, by treating a leading "-" or "_" not as a segment delimiter, but rather as a first segment). dfc28be2487c13be36a90efd778b8d8f179c589d "configmgr: Use a proper LanguageTag-based locale fallback mechanism" had changed that, instead setting `locale` to some value obtained from `LanguageTag::getFallbackStrings`, which might or might not satisfy the assert. But there was no good reason for that part of dfc28be2487c13be36a90efd778b8d8f179c589d in the first place: The workaround (as explained in the leading code comment) was meant to be carried out with the first segment of the original `locale` value, not with some fallback value. So put back here the computation of that first segment of the original `locale` value. (And drop the misleading empty line that dfc28be2487c13be36a90efd778b8d8f179c589d had, for no good reason, introduced between the workaround's leading code comment and its actual code.) However, it turns out that there was one flaw in cf7c9599e776eba8e14614cecb528d3da5778190: When the original `locale` starts with "-" or "_", the resulting `locale` representing the first segment will be "-" or "_", so the `locale.indexOf('-') == -1 && locale.indexOf('_') == -1` part of the assert would be false. But that wouldn't be an issue for the following code (the only issue would be if `locale` had become empty, in which case the `name2.startsWiht(locale)` check would trivially become true, and that for loop would erroneously pick the child with the empty `name2`), and that part of the assert had merely been there to reinforce that `locale` had indeed been stripped down to the first segment. A correct version of the assert would have used `locale.indexOf('-', 1) == -1 && locale.indexOf('_', 1) == -1` instead, but as the code now makes it obvious anyway that `locale` has been cut down here to the first segment, we can just as well simplify the assert to just the `!locale.isEmpty()` part. (The added test code unfortunately doesn't actually test this piece of code, and somewhat unexpectedly receives the "default" value from the empty string locale default, rather than the "en-US" value from the higher precedence "en-US" locale default, because `aFallbacks` happens to contain an empty string, so we already leave Access::getChild early in the "Find the best match using the LanguageTag fallback mechanism, excluding the original tag" block.) Change-Id: Ib92e714c9db4879be058529ec905e631df975424 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147113 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-15Add a rudimentary test for localized propertiesStephan Bergmann
Change-Id: I9abe06e6f1f2b6b39cbbf07043dd9c5062ff0460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147108 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-02-15Remove unused configmgr/qa/unit/urebootstrap.iniStephan Bergmann
...left behind by 6a370f580aaf060004536dfc8ca877c9a2114c66 "configmgr: remove unused old dmake file" Change-Id: I9209b672f0b3242f6801935722b3108ef692787a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147096 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
generated by cgit (git 2.34.1) at 2025-01-10 23:03:01 +0000