strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sw017 (1.15.42); FILE MERGED

Browse source 
2003/06/16 13:28:44 tl 1.15.42.1: #i15267# apostroph / typographic apostroph handling fixed
This commit is contained in:
Vladimir Glazounov 2003-06-24 06:49:21 +00:00
parent c3d612b8eb
commit 7920abc6fe
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
linguistic/source/hyphdsp.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: hyphdsp.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: tl $ $Date: 2002-09-24 13:59:39 $
* last change: $Author: vg $ $Date: 2003-06-24 07:49:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -79,6 +79,9 @@
#ifndef _ISOLANG_HXX
#include <tools/isolang.hxx>
#endif
#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
#include <unotools/localedatawrapper.hxx>
#endif
#ifndef _TOOLS_DEBUG_HXX //autogen wg. DBG_ASSERT
#include <tools/debug.hxx>
#endif
@ -322,6 +325,13 @@ Reference< XHyphenatedWord > SAL_CALL
else
{
OUString aChkWord( rWord );
// replace typographical apostroph by ascii apostroph
String aSingleQuote( GetLocaleDataWrapper( nLanguage ).getQuotationMarkEnd() );
DBG_ASSERT( 1 == aSingleQuote.Len(), "unexpectend length of quotation mark" );
if (aSingleQuote.Len())
aChkWord = aChkWord.replace( aSingleQuote.GetChar(0), '\'' );
bWordModified |= RemoveHyphens( aChkWord );
if (IsIgnoreControlChars( rProperties, GetPropSet() ))
bWordModified |= RemoveControlChars( aChkWord );
@ -442,6 +452,13 @@ Reference< XHyphenatedWord > SAL_CALL
else
{
OUString aChkWord( rWord );
// replace typographical apostroph by ascii apostroph
String aSingleQuote( GetLocaleDataWrapper( nLanguage ).getQuotationMarkEnd() );
DBG_ASSERT( 1 == aSingleQuote.Len(), "unexpectend length of quotation mark" );
if (aSingleQuote.Len())
aChkWord = aChkWord.replace( aSingleQuote.GetChar(0), '\'' );
bWordModified |= RemoveHyphens( aChkWord );
if (IsIgnoreControlChars( rProperties, GetPropSet() ))
bWordModified |= RemoveControlChars( aChkWord );
@ -558,6 +575,13 @@ Reference< XPossibleHyphens > SAL_CALL
else
{
OUString aChkWord( rWord );
// replace typographical apostroph by ascii apostroph
String aSingleQuote( GetLocaleDataWrapper( nLanguage ).getQuotationMarkEnd() );
DBG_ASSERT( 1 == aSingleQuote.Len(), "unexpectend length of quotation mark" );
if (aSingleQuote.Len())
aChkWord = aChkWord.replace( aSingleQuote.GetChar(0), '\'' );
RemoveHyphens( aChkWord );
if (IsIgnoreControlChars( rProperties, GetPropSet() ))
RemoveControlChars( aChkWord );