summaryrefslogtreecommitdiffstats
path: root/editeng
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2019-10-16 17:13:30 +0200
committerMichael Stahl <michael.stahl@cib.de>2019-10-17 11:29:50 +0200
commitb9056d049049c3f1e7b9f6d787d4a25b431c8ceb (patch)
treec1127b876d8605f07b83e98874aa9b255f1cbdd1 /editeng
parenttdf#42316 handle saving to template filters (diff)
downloadcore-b9056d049049c3f1e7b9f6d787d4a25b431c8ceb.tar.gz
core-b9056d049049c3f1e7b9f6d787d4a25b431c8ceb.zip
Resolves: tdf#127961 Add NBSP to quotation marks for all French except fr-CH
Change-Id: I71e8377bf44c2db5ef291d2990528ec16aaf3b44 Reviewed-on: https://gerrit.libreoffice.org/80909 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 8d7ec203956695475c5ce2c3e47a4aa012a48d39) Reviewed-on: https://gerrit.libreoffice.org/80932 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/misc/svxacorr.cxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7ac939811075..5857301170bd 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1195,12 +1195,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
if( '\"' == cInsChar )
{
- if( eLang.anyOf(
- LANGUAGE_FRENCH,
- LANGUAGE_FRENCH_BELGIAN,
- LANGUAGE_FRENCH_CANADIAN,
- LANGUAGE_FRENCH_SWISS,
- LANGUAGE_FRENCH_LUXEMBOURG))
+ if (primary(eLang) == primary(LANGUAGE_FRENCH) && eLang != LANGUAGE_FRENCH_SWISS)
{
OUString s( cNonBreakingSpace ); // UNICODE code for no break space
if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s ))
@@ -1240,12 +1235,7 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc const & rDoc, sal_Int32 nInsPo
if( '\"' == cInsChar )
{
- if( eLang.anyOf(
- LANGUAGE_FRENCH,
- LANGUAGE_FRENCH_BELGIAN,
- LANGUAGE_FRENCH_CANADIAN,
- LANGUAGE_FRENCH_SWISS,
- LANGUAGE_FRENCH_LUXEMBOURG))
+ if (primary(eLang) == primary(LANGUAGE_FRENCH) && eLang != LANGUAGE_FRENCH_SWISS)
{
if( bSttQuote )
sRet += " ";