sw/source/uibase/config/modcfg.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 7a7ce545697446084deaa0d9aa0feffc34dbad3d Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Sun Sep 29 00:28:20 2019 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Wed Oct 2 11:22:26 2019 +0200 tdf#92845 Save Writer - Comparison settings properly Options - Writer - Comparison -> 'Compare Documents' and 'Ignore pieces of lenght <value>' were not retained between runs of Writer. The type of these settings are defined in officecfg/registry/schema/org/openoffice/Office/Writer.xcs as follows: <prop oor:name="Mode" oor:type="xs:short"> <prop oor:name="IgnoreLength" oor:type="xs:short"> Casting the setting values to sal_Int32 did not work, because sal_Int16 maps to short. This makes the following warning (2 instances displayed when closing the Options window) go away in my local debug build and the values retained: warn:unotools.config:30387:30387:unotools/source/config/configitem.cxx:483: Exception from PutProperties com.sun.star.lang.IllegalArgumentException message: configmgr inappropriate property value context: configmgr::ChildAccess ArgumentPosition: -1 Change-Id: I59fea65378a5dfb2b6f25b9c9eaf08817862587d Reviewed-on: https://gerrit.libreoffice.org/79807 Tested-by: Jenkins Reviewed-by: László Németh <nem...@numbertext.org> Tested-by: László Németh <nem...@numbertext.org> (cherry picked from commit 32e781d268e59397016f7243fc92d5408577d593) Reviewed-on: https://gerrit.libreoffice.org/79968 Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 7c9a027ed031..adfbfc0cfb74 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -1291,10 +1291,10 @@ void SwCompareConfig::ImplCommit() Sequence<Any> aValues(aNames.getLength()); Any* pValues = aValues.getArray(); - pValues[0] <<= static_cast<sal_Int32>(m_eCmpMode); + pValues[0] <<= static_cast<sal_Int16>(m_eCmpMode); pValues[1] <<= m_bUseRsid; pValues[2] <<= m_bIgnorePieces; - pValues[3] <<= static_cast<sal_Int32>(m_nPieceLen); + pValues[3] <<= static_cast<sal_Int16>(m_nPieceLen); pValues[4] <<= m_bStoreRsid; PutProperties(aNames, aValues); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits