diff options
author | David Tardon <dtardon@redhat.com> | 2014-09-14 13:20:29 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-09-14 20:12:24 +0000 |
commit | 40716a03b60e4d5014a2ddf194f02a474b122a18 (patch) | |
tree | 896b27b79b0baed0843199b85415953aaf54fc27 | |
parent | 8618534a73e8c6b5cddb6a7cacedcc38b62bab33 (diff) |
fdo#80650 src transl. merge must be case sensitive
This makes the desired changes in
workdir/SrsPartMergeTarget/starmath/source/symbol.src. The only other
merged file that is changed is
workdir/SrsPartMergeTarget/sw/source/ui/misc/numberingtypelistbox.src,
with changes like
< "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC
- < "a, b, c, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
+ < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
< "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
This looks okay to me too :-)
Change-Id: I729075209027ed1f3fec311c05b631c0f681708b
(cherry picked from commit 03626d7940d5e2fc2abf65ef1b49a7a89623f08f)
Reviewed-on: https://gerrit.libreoffice.org/11443
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | l10ntools/source/export.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index d3d4cfb4b895..3d0096d1b775 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -275,7 +275,7 @@ Export::~Export() if ( bMergeMode ) { if ( !pMergeDataFile ) - pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, false); + pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, true); delete pMergeDataFile; } @@ -1062,14 +1062,14 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin void Export::MergeRest( ResData *pResData ) { if ( !pMergeDataFile ){ - pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false ); + pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, true ); aLanguages = pMergeDataFile->GetLanguages(); } MergeEntrys *pEntry = 0; if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle ) - pEntry = pMergeDataFile->GetMergeEntrys( pResData ); + pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData ); if ( pEntry ) { @@ -1154,7 +1154,7 @@ void Export::MergeRest( ResData *pResData ) ConvertExportContent( pResData->sId ); } - MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( pResData ); + MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData ); OString sText; bool bText = pEntrys && pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true ); |