diff --git a/changelog b/changelog index 061181d16..5ecbffccd 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,19 @@ +libreoffice (1:7.3.7-0ubuntu0.22.04.2) jammy; urgency=medium + + * Cherry picked bug fixes release (LP: #2003335) + + * Don’t set language to none on defined styles (tdf#126657, tdf#145104) + - ubuntu-0002-tdf-126657-tdf-145104-Don-t-set-language-to-none-on-.patch + * Fix bug in copying table where we need to create a primary key + - ubuntu-0003-Fix-bug-in-copying-table-where-we-need-to-create-a-p.patch + - ubuntu-0004-error-when-copying-table-and-the-copy-table-wizard-c.patch + - ubuntu-0005-make-ValueTransfer-easier-to-understand.patch + * Switch default currency HRK Croatian Kuna to EUR Euro + - ubuntu-0006-Related-tdf-150011-Add-HRK-Croatian-Kuna-to-Euro-con.patch + - ubuntu-0007-Resolves-tdf-150011-Switch-default-currency-HRK-Croa.patch + + -- Rico Tzschichholz Thu, 02 Feb 2023 12:42:49 +0100 + libreoffice (1:7.3.7-0ubuntu0.22.04.1) jammy; urgency=medium * New upstream release (LP: #1995054) diff --git a/patches/series b/patches/series index bf1fd05ea..2cbb51557 100644 --- a/patches/series +++ b/patches/series @@ -53,3 +53,9 @@ sfx2-Put-temp-file-for-offline-help-inside-user-s-do.patch tdf-108560-horribly-slow-to-paste-many-lines-into-ed.patch arm-fp-mode.diff moreIconsDialog-accesses-internet.diff +ubuntu-0002-tdf-126657-tdf-145104-Don-t-set-language-to-none-on-.patch +ubuntu-0003-Fix-bug-in-copying-table-where-we-need-to-create-a-p.patch +ubuntu-0004-error-when-copying-table-and-the-copy-table-wizard-c.patch +ubuntu-0005-make-ValueTransfer-easier-to-understand.patch +ubuntu-0006-Related-tdf-150011-Add-HRK-Croatian-Kuna-to-Euro-con.patch +ubuntu-0007-Resolves-tdf-150011-Switch-default-currency-HRK-Croa.patch diff --git a/patches/ubuntu-0002-tdf-126657-tdf-145104-Don-t-set-language-to-none-on-.patch b/patches/ubuntu-0002-tdf-126657-tdf-145104-Don-t-set-language-to-none-on-.patch new file mode 100644 index 000000000..b78284cbd --- /dev/null +++ b/patches/ubuntu-0002-tdf-126657-tdf-145104-Don-t-set-language-to-none-on-.patch @@ -0,0 +1,84 @@ +From 95ffd058ddacede4b2795c7e7664d784eb87b38c Mon Sep 17 00:00:00 2001 +From: Khaled Hosny +Date: Mon, 3 Oct 2022 13:06:19 +0200 +Subject: =?UTF-8?q?tdf#126657,=20tdf#145104:=20Don=E2=80=99t=20set=20langu?= + =?UTF-8?q?age=20to=20none=20on=20defined=20styles?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Language is used for more things than spell checking (localized digits, +accessibility, OpenType layout, and probably more). + +A better way is needed to disable spell checking for parts of the +document by default while keeping the language alone, but right now I’m +reverting these changes because they are workarounds for essentially +cosmetic issues. + +This reverts the following commits: + +commit ca91beb9d983754a5cba9e3df1bf18295e6640a0 +Author: Vladimir Glazounov +Date: Wed Jun 4 08:50:40 2008 +0000 + + INTEGRATION: CWS sw30bf04 (1.51.2); FILE MERGED + 2008/05/13 07:20:17 fme 1.51.2.1: #i40133# rail: Set internet link style language to none to prevent spell checking + +commit 137a1d5380e310a43d36932c643e1331a94fd70d +Author: Heiko Tietze +Date: Mon Jul 19 16:40:50 2021 +0200 + + Resolves tdf#143066 - Language set to None for indices + +Change-Id: Idc9455f3f04e661bd00a9829dd0f0916844dc8eb +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140902 +Tested-by: Jenkins +Reviewed-by: خالد حسني +(cherry picked from commit 2cca160f8bfc4597cf0ad3aaaf0017a5210ea0ec) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140958 +--- + sw/source/core/doc/DocumentStylePoolManager.cxx | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx +index 1dc1885c8e98..4c9720e067bb 100644 +--- a/sw/source/core/doc/DocumentStylePoolManager.cxx ++++ b/sw/source/core/doc/DocumentStylePoolManager.cxx +@@ -823,14 +823,6 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, + aSet.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) ); + aSet.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) ); + } +- // tdf#143066 : set language to 'none' to prevent spell checking for indices +- if (nId == RES_POOLCOLL_REGISTER_BASE) +- { +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) ); +- } +- break; + } + break; + +@@ -1559,19 +1551,12 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId ) + { + aSet.Put( SvxColorItem( COL_BLUE, RES_CHRATR_COLOR ) ); + aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) ); +- // i40133: patch submitted by rail: set language to 'none' to prevent spell checking: +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) ); + } + break; + case RES_POOLCHR_INET_VISIT: + { + aSet.Put( SvxColorItem( COL_RED, RES_CHRATR_COLOR ) ); + aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) ); +- aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) ); + } + break; + case RES_POOLCHR_JUMPEDIT: +-- +2.37.2 + diff --git a/patches/ubuntu-0003-Fix-bug-in-copying-table-where-we-need-to-create-a-p.patch b/patches/ubuntu-0003-Fix-bug-in-copying-table-where-we-need-to-create-a-p.patch new file mode 100644 index 000000000..8c33e6cf4 --- /dev/null +++ b/patches/ubuntu-0003-Fix-bug-in-copying-table-where-we-need-to-create-a-p.patch @@ -0,0 +1,87 @@ +From 925e17545e7902eb8a5a82cf8d9423a8034857b3 Mon Sep 17 00:00:00 2001 +From: Noel Grandin +Date: Fri, 28 Oct 2022 12:26:00 +0200 +Subject: Fix bug in copying table where we need to create a primary key + +The problem seems to be that + + commit fa177231cd20bf3c3f4bb9b50f6646da139c6766 + Author: Tamas Bunth + Date: Fri Aug 30 14:57:31 2019 +0200 + tdf#127093, tdf#127092 Fix pasting autoincremented + +was reverted in commit d783017c1ccb4e62e99f26b42250ac4e15780cff. + +But the follow-on commit + commit 376cc3ea0fc2e0f209763a2a27c5852136332c86 + Author: Tamas Bunth + Date: Sat Aug 31 18:27:44 2019 +0200 + dbaccess: delete old paste autoincrement logic + +was not reverted. + +This is not a straight revert of the second commit, because +autoincrement has since been improved with + + commit 2a8e120db1c3175ff937cdbe6d0ade23dc380c01 + Author: Oleksii Makhotin + Date: Tue Apr 6 16:03:41 2021 +0300 + tdf#119962 Fix autoincrement for copied table + +Change-Id: Ia9657d88b3e77ba72399ad9afeece3bda3f57038 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141967 +Tested-by: Jenkins +Reviewed-by: Noel Grandin +(cherry picked from commit 0325be6f3de622be6af9b2f686e3c7afae0405b1) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141933 +Tested-by: Noel Grandin +--- + dbaccess/source/ui/uno/copytablewizard.cxx | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx +index 9ebd7d6df288..dfc179ff367c 100644 +--- a/dbaccess/source/ui/uno/copytablewizard.cxx ++++ b/dbaccess/source/ui/uno/copytablewizard.cxx +@@ -1068,6 +1068,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + + const OCopyTableWizard& rWizard = impl_getDialog_throw(); + ODatabaseExport::TPositions aColumnPositions = rWizard.GetColumnPositions(); ++ const bool bShouldCreatePrimaryKey = rWizard.shouldCreatePrimaryKey(); + + Reference< XRow > xRow ( _rxSourceResultSet, UNO_QUERY_THROW ); + Reference< XRowLocate > xRowLocate ( _rxSourceResultSet, UNO_QUERY_THROW ); +@@ -1139,6 +1140,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + aCopyEvent.Error.clear(); + try + { ++ bool bInsertedPrimaryKey = false; + // notify listeners + m_aCopyTableListeners.notifyEach( &XCopyTableListener::copyingRow, aCopyEvent ); + +@@ -1156,6 +1158,14 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + continue; + } + ++ if ( bShouldCreatePrimaryKey && !bInsertedPrimaryKey ) ++ { ++ xStatementParams->setInt( 1, nRowCount ); ++ ++nSourceColumn; ++ bInsertedPrimaryKey = true; ++ continue; ++ } ++ + if ( ( nSourceColumn < 1 ) || ( nSourceColumn >= static_cast(aSourceColTypes.size()) ) ) + { // ( we have to check here against 1 because the parameters are 1 based) + ::dbtools::throwSQLException("Internal error: invalid column type index.", +@@ -1257,6 +1267,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + } + catch( const Exception& ) + { ++ TOOLS_WARN_EXCEPTION("dbaccess", ""); + aCopyEvent.Error = ::cppu::getCaughtException(); + } + +-- +2.37.2 + diff --git a/patches/ubuntu-0004-error-when-copying-table-and-the-copy-table-wizard-c.patch b/patches/ubuntu-0004-error-when-copying-table-and-the-copy-table-wizard-c.patch new file mode 100644 index 000000000..b4882c52b --- /dev/null +++ b/patches/ubuntu-0004-error-when-copying-table-and-the-copy-table-wizard-c.patch @@ -0,0 +1,39 @@ +From 5d834c1a1ca0a96820877539745a03b0f1d8d49f Mon Sep 17 00:00:00 2001 +From: Noel Grandin +Date: Mon, 31 Oct 2022 12:08:50 +0200 +Subject: error when copying table and the copy table wizard creates the + primary key + +then the primary key will not be IDENTITY column, and the + ALTER TABLE...RESTART WITH +will product an error + +Change-Id: If17bd0cbfe3519f9074aebb819b7d85ccea63e1a +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141970 +Tested-by: Jenkins +Reviewed-by: Noel Grandin +(cherry picked from commit 85a5233275ab83fe0d6b943b298695387d97accd) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141931 +Tested-by: Noel Grandin +--- + dbaccess/source/ui/uno/copytablewizard.cxx | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx +index dfc179ff367c..4404c9595c1d 100644 +--- a/dbaccess/source/ui/uno/copytablewizard.cxx ++++ b/dbaccess/source/ui/uno/copytablewizard.cxx +@@ -1380,7 +1380,9 @@ void CopyTableWizard::impl_doCopy_nothrow() + } + } + +- if (!sPKCL.isEmpty()) ++ // If we created a new primary key, then it won't necessarily be an IDENTITY column ++ const bool bShouldCreatePrimaryKey = rWizard.shouldCreatePrimaryKey(); ++ if (!bShouldCreatePrimaryKey && !sPKCL.isEmpty()) + { + OUString strSql = "SELECT MAX(\"" + sPKCL + "\") FROM " + sComposedTableName; + +-- +2.37.2 + diff --git a/patches/ubuntu-0005-make-ValueTransfer-easier-to-understand.patch b/patches/ubuntu-0005-make-ValueTransfer-easier-to-understand.patch new file mode 100644 index 000000000..bf4a5b757 --- /dev/null +++ b/patches/ubuntu-0005-make-ValueTransfer-easier-to-understand.patch @@ -0,0 +1,188 @@ +From 1515e06195745974cadf28c4522fc347c3beba67 Mon Sep 17 00:00:00 2001 +From: Noel Grandin +Date: Fri, 28 Oct 2022 11:28:58 +0200 +Subject: make ValueTransfer easier to understand + +storing references to local variables makes it harder to figure out what +the control flow is doing. + +Change-Id: Ifa7fedd6e4be19a0aa8180aa4f754f1811ca44a2 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141965 +Tested-by: Jenkins +Reviewed-by: Noel Grandin +(cherry picked from commit ca82061c2cad00aeddb17b766063776fee0ee41a) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142206 +Tested-by: Aron Budea +Reviewed-by: Aron Budea +--- + dbaccess/source/ui/uno/copytablewizard.cxx | 68 +++++++++++----------- + 1 file changed, 33 insertions(+), 35 deletions(-) + +diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx +index 4404c9595c1d..5894a642594e 100644 +--- a/dbaccess/source/ui/uno/copytablewizard.cxx ++++ b/dbaccess/source/ui/uno/copytablewizard.cxx +@@ -942,40 +942,39 @@ namespace + class ValueTransfer + { + public: +- ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& _rDestPos, std::vector< sal_Int32 >&& _rColTypes, ++ ValueTransfer( std::vector< sal_Int32 > _rColTypes, + const Reference< XRow >& _rxSource, const Reference< XParameters >& _rxDest ) +- :m_rSourcePos( _rSourcePos ) +- ,m_rDestPos( _rDestPos ) +- ,m_rColTypes( std::move(_rColTypes) ) ++ :m_ColTypes( std::move(_rColTypes) ) + ,m_xSource( _rxSource ) + ,m_xDest( _rxDest ) + { + } + + template< typename VALUE_TYPE > +- void transferValue( VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ), ++ void transferValue( sal_Int32 _nSourcePos, sal_Int32 _nDestPos, ++ VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ), + void (SAL_CALL XParameters::*_pSetter)( sal_Int32, VALUE_TYPE ) ) + { +- VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) ); ++ VALUE_TYPE value( (m_xSource.get()->*_pGetter)( _nSourcePos ) ); + if ( m_xSource->wasNull() ) +- m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] ); ++ m_xDest->setNull( _nDestPos, m_ColTypes[ _nSourcePos ] ); + else +- (m_xDest.get()->*_pSetter)( m_rDestPos, value ); ++ (m_xDest.get()->*_pSetter)( _nDestPos, value ); + } +- template< typename VALUE_TYPE > +- void transferComplexValue( VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ), ++ ++ template< typename VALUE_TYPE > ++ void transferComplexValue( sal_Int32 _nSourcePos, sal_Int32 _nDestPos, ++ VALUE_TYPE ( SAL_CALL XRow::*_pGetter )( sal_Int32 ), + void (SAL_CALL XParameters::*_pSetter)( sal_Int32, const VALUE_TYPE& ) ) + { +- const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) ); ++ const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( _nSourcePos ) ); + if ( m_xSource->wasNull() ) +- m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] ); ++ m_xDest->setNull( _nDestPos, m_ColTypes[ _nSourcePos ] ); + else +- (m_xDest.get()->*_pSetter)( m_rDestPos, value ); ++ (m_xDest.get()->*_pSetter)( _nDestPos, value ); + } + private: +- const sal_Int32& m_rSourcePos; +- const sal_Int32& m_rDestPos; +- const std::vector< sal_Int32 > m_rColTypes; ++ const std::vector< sal_Int32 > m_ColTypes; + const Reference< XRow > m_xSource; + const Reference< XParameters > m_xDest; + }; +@@ -1144,13 +1143,12 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + // notify listeners + m_aCopyTableListeners.notifyEach( &XCopyTableListener::copyingRow, aCopyEvent ); + +- sal_Int32 nDestColumn( 0 ); +- sal_Int32 nSourceColumn( 1 ); +- ValueTransfer aTransfer( nSourceColumn, nDestColumn, std::vector(aSourceColTypes), xRow, xStatementParams ); ++ sal_Int32 nSourceColumn( 0 ); ++ ValueTransfer aTransfer( aSourceColTypes, xRow, xStatementParams ); + + for ( auto const& rColumnPos : aColumnPositions ) + { +- nDestColumn = rColumnPos.first; ++ sal_Int32 nDestColumn = rColumnPos.first; + if ( nDestColumn == COLUMN_POSITION_NOT_FOUND ) + { + ++nSourceColumn; +@@ -1176,7 +1174,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + { + case DataType::DOUBLE: + case DataType::REAL: +- aTransfer.transferValue( &XRow::getDouble, &XParameters::setDouble ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getDouble, &XParameters::setDouble ); + break; + + case DataType::CHAR: +@@ -1184,64 +1182,64 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou + case DataType::LONGVARCHAR: + case DataType::DECIMAL: + case DataType::NUMERIC: +- aTransfer.transferComplexValue( &XRow::getString, &XParameters::setString ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getString, &XParameters::setString ); + break; + + case DataType::BIGINT: +- aTransfer.transferValue( &XRow::getLong, &XParameters::setLong ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getLong, &XParameters::setLong ); + break; + + case DataType::FLOAT: +- aTransfer.transferValue( &XRow::getFloat, &XParameters::setFloat ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getFloat, &XParameters::setFloat ); + break; + + case DataType::LONGVARBINARY: + case DataType::BINARY: + case DataType::VARBINARY: +- aTransfer.transferComplexValue( &XRow::getBytes, &XParameters::setBytes ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getBytes, &XParameters::setBytes ); + break; + + case DataType::DATE: +- aTransfer.transferComplexValue( &XRow::getDate, &XParameters::setDate ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getDate, &XParameters::setDate ); + break; + + case DataType::TIME: +- aTransfer.transferComplexValue( &XRow::getTime, &XParameters::setTime ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getTime, &XParameters::setTime ); + break; + + case DataType::TIMESTAMP: +- aTransfer.transferComplexValue( &XRow::getTimestamp, &XParameters::setTimestamp ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getTimestamp, &XParameters::setTimestamp ); + break; + + case DataType::BIT: + if ( aSourcePrec[nSourceColumn] > 1 ) + { +- aTransfer.transferComplexValue( &XRow::getBytes, &XParameters::setBytes ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getBytes, &XParameters::setBytes ); + break; + } + [[fallthrough]]; + case DataType::BOOLEAN: +- aTransfer.transferValue( &XRow::getBoolean, &XParameters::setBoolean ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getBoolean, &XParameters::setBoolean ); + break; + + case DataType::TINYINT: +- aTransfer.transferValue( &XRow::getByte, &XParameters::setByte ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getByte, &XParameters::setByte ); + break; + + case DataType::SMALLINT: +- aTransfer.transferValue( &XRow::getShort, &XParameters::setShort ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getShort, &XParameters::setShort ); + break; + + case DataType::INTEGER: +- aTransfer.transferValue( &XRow::getInt, &XParameters::setInt ); ++ aTransfer.transferValue( nSourceColumn, nDestColumn, &XRow::getInt, &XParameters::setInt ); + break; + + case DataType::BLOB: +- aTransfer.transferComplexValue( &XRow::getBlob, &XParameters::setBlob ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getBlob, &XParameters::setBlob ); + break; + + case DataType::CLOB: +- aTransfer.transferComplexValue( &XRow::getClob, &XParameters::setClob ); ++ aTransfer.transferComplexValue( nSourceColumn, nDestColumn, &XRow::getClob, &XParameters::setClob ); + break; + + default: +-- +2.37.2 + diff --git a/patches/ubuntu-0006-Related-tdf-150011-Add-HRK-Croatian-Kuna-to-Euro-con.patch b/patches/ubuntu-0006-Related-tdf-150011-Add-HRK-Croatian-Kuna-to-Euro-con.patch new file mode 100644 index 000000000..bee848c90 --- /dev/null +++ b/patches/ubuntu-0006-Related-tdf-150011-Add-HRK-Croatian-Kuna-to-Euro-con.patch @@ -0,0 +1,81 @@ +From b1a2f727ca99ecd3402d4b051b99cbfd24266e59 Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Fri, 22 Jul 2022 22:17:11 +0200 +Subject: [PATCH] Related: tdf#150011 Add HRK Croatian Kuna to Euro conversion + wizard + +Maybe just for completeness, it's removed from menu but might be +callable as macro. + +Change-Id: Iade0be845186d3deb2f00f4aaa230c0b344cea72 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137372 +Reviewed-by: Eike Rathke +Tested-by: Jenkins +--- + wizards/source/euro/Init.xba | 16 ++++++++++++++++ + .../source/resources/resources_en_US.properties | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba +index 623a0a53be46..9f56c503a347 100644 +--- a/wizards/source/euro/Init.xba ++++ b/wizards/source/euro/Init.xba +@@ -89,6 +89,7 @@ Public sCurrSLOVAK as String + Public sCurrESTONIAN as String + Public sCurrLATVIAN as String + Public sCurrLITHUANIAN as String ++Public sCurrCROATIAN as String + + Public sPrgsRETRIEVAL as String + Public sPrgsCONVERTING as String +@@ -214,6 +215,7 @@ Dim LocWorkPath as String + sCurrESTONIAN = GetResText("CURRENCIES_16") + sCurrLATVIAN = GetResText("CURRENCIES_17") + sCurrLITHUANIAN = GetResText("CURRENCIES_18") ++ sCurrCROATIAN = GetResText("CURRENCIES_19") + .cmdCancel.Label = sCANCEL + .cmdHelp.Label = sHELP + .cmdBack.Label = GetResText("STEP_ZERO_2") +@@ -393,6 +395,11 @@ Sub InitializeLanguages() + LangIDValue(18,0,1) = "LT" + LangIDValue(18,0,2) = "-427" + ++' CURRENCIES_CROATIAN ++ LangIDValue(19,0,0) = "hr" ++ LangIDValue(19,0,1) = "HR" ++ LangIDValue(19,0,2) = "-41A" ++ + End Sub + + +@@ -572,6 +579,15 @@ Dim i as Integer + CurrValue(18,4) = "Lt" + CurrValue(18,5) = "LTL" + ++ CurrValue(19,0) = sCurrCROATIAN ++ ' real conversion rate ++ CurrValue(19,1) = 7.53450 ++ ' rounded conversion rate ++ CurrValue(19,2) = 7.5 ++ CurrValue(19,3) = "kn" ++ CurrValue(19,4) = "kn" ++ CurrValue(19,5) = "HRK" ++ + i = -1 + CurrSymbolList(0) = "" + CurrSymbolList(1) = "" +diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties +index 32f9104e97e0..8649b2500e6a 100644 +--- a/wizards/source/resources/resources_en_US.properties ++++ b/wizards/source/resources/resources_en_US.properties +@@ -448,6 +448,7 @@ CURRENCIES_15=Slovak Koruna + CURRENCIES_16=Estonian Kroon + CURRENCIES_17=Latvian Lats + CURRENCIES_18=Lithuanian Litas ++CURRENCIES_19=Croatian Kuna + STEP_LASTPAGE_0=Progress + STEP_LASTPAGE_1=Retrieving the relevant documents... + STEP_LASTPAGE_2=Converting the documents... +-- +2.38.1 + diff --git a/patches/ubuntu-0007-Resolves-tdf-150011-Switch-default-currency-HRK-Croa.patch b/patches/ubuntu-0007-Resolves-tdf-150011-Switch-default-currency-HRK-Croa.patch new file mode 100644 index 000000000..2ee0376b3 --- /dev/null +++ b/patches/ubuntu-0007-Resolves-tdf-150011-Switch-default-currency-HRK-Croa.patch @@ -0,0 +1,44 @@ +From 5c876d62f1a36305ffd6e59bd53a18673bb1a34d Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Sun, 27 Nov 2022 17:11:49 +0100 +Subject: [PATCH] Resolves: tdf#150011 Switch default currency HRK Croatian + Kuna to EUR Euro + +HR will join Euro area on 2023-01-01. + +Change-Id: I3836804ff68419550091826ea2414bc0edd55a84 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143346 +Reviewed-by: Eike Rathke +Tested-by: Jenkins +(cherry picked from commit c58bc31ece80ccdfc88bd043787869c5e460dbd8) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143269 +Reviewed-by: Adolfo Jayme Barrientos +--- + i18npool/source/localedata/data/hr_HR.xml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml +index 4de83e5535cd..1d29f1f2e0e6 100644 +--- a/i18npool/source/localedata/data/hr_HR.xml ++++ b/i18npool/source/localedata/data/hr_HR.xml +@@ -414,15 +414,14 @@ + + + +- ++ + HRK + kn + HRK + Hrvatska Kuna + 2 + +- +- ++ + EUR + € + EUR +-- +2.38.1 +