summaryrefslogtreecommitdiff
path: root/editeng/inc
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-02-16 18:29:26 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-02-16 18:29:26 +0100
commit3c248f165dbe07a7a1d9087cb4dd8f53768f4821 (patch)
tree9f7f85709dfef14403e0021409de536c27945af3 /editeng/inc
parent3ccb6c9e3a33c0b95dafc1fb0071dc5df50ce49a (diff)
parentdf281dde0af441f66d1be324b33571d575af77a0 (diff)
CWS-TOOLING: integrate CWS cbosdo01
Diffstat (limited to 'editeng/inc')
-rw-r--r--editeng/inc/editeng/svxacorr.hxx12
-rw-r--r--editeng/inc/editeng/swafopt.hxx3
2 files changed, 8 insertions, 7 deletions
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index fe8cf1196593..3ebb0ae9e69f 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -54,7 +54,7 @@ class SotStorage;
// Flags fuer die AutoKorrekt-Flags
const long CptlSttSntnc = 0x00000001; // Gross-Buchstaben am SatzAnfang
const long CptlSttWrd = 0x00000002; // keine 2 Gr.-Buchst. am WordAnfang
-const long ChgFractionSymbol= 0x00000004; // 1/2, 1/4, .. ersetzen
+const long AddNonBrkSpace = 0x00000004; // Add non breaking space before :;?!
const long ChgOrdinalNumber = 0x00000008; // Ordinal-Number 1st, 2nd,..
const long ChgToEnEmDash = 0x00000010; // - -> Endash/Emdash
const long ChgWeightUnderl = 0x00000020; // * -> Fett, _ -> unterstreichen
@@ -63,7 +63,7 @@ const long Autocorrect = 0x00000080; // Autokorrektur aufrufen
const long ChgQuotes = 0x00000100; // doppelte Quotes ersetzen
const long SaveWordCplSttLst= 0x00000200; // GrB. am SatzAnf. auto. aufnehmen
const long SaveWordWrdSttLst= 0x00000400; // 2 GrB. am WortAnf. auto. aufnehmen
-const long IngnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren
+const long IgnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren
const long ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen
const long ChgWordLstLoad = 0x20000000; // Ersetzungsliste geladen
@@ -216,7 +216,6 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
long nFlags;
sal_Unicode cStartDQuote, cEndDQuote, cStartSQuote, cEndSQuote,
- c1Div2, c1Div4, c3Div4,
cEmDash, cEnDash;
@@ -359,14 +358,15 @@ public:
BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
- BOOL FnChgFractionSymbol( SvxAutoCorrDoc&, const String&,
- xub_StrLen nSttPos, xub_StrLen nEndPos );
BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
+ BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+ xub_StrLen nSttPos, xub_StrLen nEndPos,
+ LanguageType eLang = LANGUAGE_SYSTEM );
BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang = LANGUAGE_SYSTEM );
@@ -384,6 +384,8 @@ public:
// (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
static sal_Bool IsAutoCorrectChar( sal_Unicode cChar );
+ sal_Bool NeedsHardspaceAutocorr( sal_Unicode cChar );
+
CharClass& GetCharClass( LanguageType eLang )
{
if( !pCharClass || eLang != eCharClassLang )
diff --git a/editeng/inc/editeng/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index 2cb67ee2b43b..bcd37c8e3983 100644
--- a/editeng/inc/editeng/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -52,7 +52,6 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
BYTE nRightMargin;
- BOOL bReplaceQuote : 1;
BOOL bAutoCorrect : 1;
BOOL bCptlSttSntnc : 1;
BOOL bCptlSttWrd : 1;
@@ -65,9 +64,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
BOOL bDelEmptyNode : 1;
BOOL bSetNumRule : 1;
- BOOL bChgFracionSymbol : 1;
BOOL bChgOrdinalNumber : 1;
BOOL bChgToEnEmDash : 1;
+ BOOL bAddNonBrkSpace : 1;
BOOL bChgWeightUnderl : 1;
BOOL bSetINetAttr : 1;