diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-11-25 14:41:44 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-11-25 14:41:44 +0100 |
commit | b6b109c22da8572cc7c483bbd0571e7f0877313e (patch) | |
tree | 38a3accfccb59c26c77a9d05fcf62e7d787a683c | |
parent | dfd19e2f33ac5bdc3a703a37b88a2ccce831a42c (diff) |
cbosdo01: Implemented i#107083.
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 11 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 11 | ||||
-rw-r--r-- | svx/inc/svx/svxacorr.hxx | 5 | ||||
-rw-r--r-- | svx/inc/svx/swafopt.hxx | 1 | ||||
-rw-r--r-- | svx/source/cui/autocdlg.cxx | 15 | ||||
-rw-r--r-- | svx/source/cui/autocdlg.hrc | 3 | ||||
-rw-r--r-- | svx/source/cui/autocdlg.hxx | 2 | ||||
-rw-r--r-- | svx/source/cui/autocdlg.src | 4 | ||||
-rw-r--r-- | svx/source/editeng/acorrcfg.cxx | 41 | ||||
-rw-r--r-- | svx/source/editeng/svxacorr.cxx | 41 | ||||
-rw-r--r-- | svx/source/editeng/swafopt.cxx | 2 | ||||
-rw-r--r-- | svx/util/hidother.src | 6 |
12 files changed, 22 insertions, 120 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index cfb780687eae..8fa14691907d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1298,17 +1298,6 @@ Dymamic border coloring means that when the mouse is hovered over a control, and </info> <value>true</value> </prop> - <prop oor:name="ChangeFraction" oor:type="xs:boolean"> - <!-- OldPath: AutoCorrect/Options/All --> - <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace 1/2... --> - <info> - <author>OS</author> - <desc>Specifies if character combinations for fractions should be replaced with a corresponding single character.</desc> - <label>Replace fractions</label> - </info> - <value>true</value> - </prop> <prop oor:name="ChangeDash" oor:type="xs:boolean"> <!-- OldPath: AutoCorrect/Options/All --> <!-- OldLocation: Soffice.cfg --> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index a47eabe7b2c8..539f563d4f2b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4391,17 +4391,6 @@ </info> <value>true</value> </prop> - <prop oor:name="ChangeFraction" oor:type="xs:boolean"> - <!-- OldPath: Writer/AutoFormat/Options --> - <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace 1/2... --> - <info> - <author>OS</author> - <desc>Specifies if character combinations for fractions are replaced with a corresponding single character.</desc> - <label>Replace fractions</label> - </info> - <value>true</value> - </prop> <prop oor:name="ChangeDash" oor:type="xs:boolean"> <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx index 08da2ffabf0f..8564e12fffd9 100644 --- a/svx/inc/svx/svxacorr.hxx +++ b/svx/inc/svx/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 @@ -65,7 +65,6 @@ 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 ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen -const long AddNonBrkSpace = 0x00002000; // Add non breaking space before :;?! const long ChgWordLstLoad = 0x20000000; // Ersetzungsliste geladen const long CplSttLstLoad = 0x40000000; // Exceptionlist fuer CplStart geladen @@ -360,8 +359,6 @@ 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 ); diff --git a/svx/inc/svx/swafopt.hxx b/svx/inc/svx/swafopt.hxx index 48f22d1a8db7..3a2987121ce5 100644 --- a/svx/inc/svx/swafopt.hxx +++ b/svx/inc/svx/swafopt.hxx @@ -65,7 +65,6 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags BOOL bDelEmptyNode : 1; BOOL bSetNumRule : 1; - BOOL bChgFracionSymbol : 1; BOOL bChgOrdinalNumber : 1; BOOL bChgToEnEmDash : 1; BOOL bAddNonBrkSpace : 1; diff --git a/svx/source/cui/autocdlg.cxx b/svx/source/cui/autocdlg.cxx index 54b11da9daad..57df1079b0a7 100644 --- a/svx/source/cui/autocdlg.cxx +++ b/svx/source/cui/autocdlg.cxx @@ -231,7 +231,6 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, sBoldUnderline (SVX_RES(ST_BOLD_UNDER )), sURL (SVX_RES(ST_DETECT_URL )), sNoDblSpaces (SVX_RES(STR_NO_DBL_SPACES )), - sHalf (SVX_RES(ST_FRACTION )), sDash (SVX_RES(ST_DASH )) { FreeResource(); @@ -274,7 +273,6 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); @@ -314,7 +312,6 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry(sStartCap); aCheckLB.InsertEntry(sBoldUnderline); aCheckLB.InsertEntry(sURL); - aCheckLB.InsertEntry(sHalf); aCheckLB.InsertEntry(sDash); aCheckLB.InsertEntry(sNoDblSpaces); @@ -324,7 +321,6 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CptlSttSntnc) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgWeightUnderl) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & SetINetAttr) ); - aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) ); @@ -453,7 +449,6 @@ enum OfaAutoFmtOptions BEGIN_UPPER, BOLD_UNDERLINE, DETECT_URL, - REPLACE_HALF, REPLACE_DASHES, DEL_SPACES_AT_STT_END, DEL_SPACES_BETWEEN_LINES, @@ -487,7 +482,6 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, sBullet (SVX_RES( ST_BULLET )), sBoldUnder (SVX_RES( ST_BOLD_UNDER )), sNoDblSpaces (SVX_RES( STR_NO_DBL_SPACES)), - sFraction (SVX_RES( ST_FRACTION )), sDetectURL (SVX_RES( ST_DETECT_URL )), sDash (SVX_RES( ST_DASH )), sRightMargin (SVX_RES( ST_RIGHT_MARGIN )), @@ -679,12 +673,6 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) bModified |= pOpt->bReplaceStyles != bCheck; pOpt->bReplaceStyles = bCheck; - bCheck = aCheckLB.IsChecked(REPLACE_HALF, CBCOL_FIRST); - bModified |= pOpt->bChgFracionSymbol != bCheck; - pOpt->bChgFracionSymbol = bCheck; - pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol, - aCheckLB.IsChecked(REPLACE_HALF, CBCOL_SECOND)); - bCheck = aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_FIRST); bModified |= pOpt->bChgToEnEmDash != bCheck; pOpt->bChgToEnEmDash = bCheck; @@ -744,7 +732,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sFraction, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); @@ -771,8 +758,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IngnoreDoubleSpace) ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); - aCheckLB.CheckEntryPos( REPLACE_HALF, CBCOL_FIRST, pOpt->bChgFracionSymbol ); - aCheckLB.CheckEntryPos( REPLACE_HALF, CBCOL_SECOND, 0 != (nFlags & ChgFractionSymbol) ); aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); diff --git a/svx/source/cui/autocdlg.hrc b/svx/source/cui/autocdlg.hrc index 99a8683342a4..a719f18d38aa 100644 --- a/svx/source/cui/autocdlg.hrc +++ b/svx/source/cui/autocdlg.hrc @@ -148,11 +148,10 @@ #define STR_NO_DBL_SPACES 204 #define ST_DETECT_URL 205 #define ST_ORDINAL 206 -#define ST_FRACTION 207 +#define ST_NON_BREAK_SPACE 207 #define ST_DASH 208 #define FT_LANG 209 #define LB_LANG 210 -#define ST_NON_BREAK_SPACE 211 #define CB_SMARTTAGS 220 #define FT_SMARTTAGS 221 diff --git a/svx/source/cui/autocdlg.hxx b/svx/source/cui/autocdlg.hxx index af25dee35954..110848ad75b7 100644 --- a/svx/source/cui/autocdlg.hxx +++ b/svx/source/cui/autocdlg.hxx @@ -116,7 +116,6 @@ private: String sBoldUnderline; String sURL; String sNoDblSpaces; - String sHalf; String sDash; String sNonBrkSpace; String sFirst; @@ -158,7 +157,6 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage String sByInputBullet; String sBoldUnder; String sNoDblSpaces; - String sFraction; String sDetectURL; String sDash; String sNonBrkSpace; diff --git a/svx/source/cui/autocdlg.src b/svx/source/cui/autocdlg.src index 47fb447a402c..139d89e59ba5 100644 --- a/svx/source/cui/autocdlg.src +++ b/svx/source/cui/autocdlg.src @@ -129,10 +129,6 @@ TabDialog RID_OFA_AUTOCORR_DLG { \ Text [ en-US ] = "URL Recognition" ; \ }; \ - String ST_FRACTION \ - { \ - Text [ en-US ] = "Replace 1/2 ... with ½ ..." ; \ - }; \ String ST_DASH \ { \ Text [ en-US ] = "Replace dashes" ; \ diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 1c89afb2566a..3a7519353efb 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -119,6 +119,7 @@ Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames() "ChangeUnderlineWeight", // 5 "SetInetAttribute", // 6 "ChangeOrdinalNumber", // 7 + "AddNonBreakingSpace", // 8 "ChangeFraction", // 8 "ChangeDash", // 9 "RemoveDoubleSpaces", // 10 @@ -127,10 +128,9 @@ Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames() "SingleQuoteAtEnd", // 13 "ReplaceDoubleQuote", // 14 "DoubleQuoteAtStart", // 15 - "DoubleQuoteAtEnd", // 16 - "AddNonBreakingSpace" // 17 + "DoubleQuoteAtEnd" // 16 }; - const int nCount = 18; + const int nCount = 17; Sequence<OUString> aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -190,10 +190,10 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) if(*(sal_Bool*)pValues[nProp].getValue()) nFlags |= ChgOrdinalNumber; break;//"ChangeOrdinalNumber", - case 8: + case 8: if(*(sal_Bool*)pValues[nProp].getValue()) - nFlags |= ChgFractionSymbol; - break;//"ChangeFraction", + nFlags |= AddNonBrkSpace; + break;//"AddNonBreakingSpace" case 9: if(*(sal_Bool*)pValues[nProp].getValue()) nFlags |= ChgToEnEmDash; @@ -230,10 +230,6 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) rParent.pAutoCorrect->SetEndDoubleQuote( sal::static_int_cast< sal_Unicode >( nTemp ) ); break;//"DoubleQuoteAtEnd" - case 17: - if(*(sal_Bool*)pValues[nProp].getValue()) - nFlags |= AddNonBrkSpace; - break;//"AddNonBreakingSpace" } } } @@ -306,10 +302,10 @@ void SvxBaseAutoCorrCfg::Commit() bVal = 0 != (nFlags & ChgOrdinalNumber); pValues[nProp].setValue(&bVal, rType); break;//"ChangeOrdinalNumber", - case 8: - bVal = 0 != (nFlags & ChgFractionSymbol); + case 8: + bVal = 0 != (nFlags & AddNonBrkSpace); pValues[nProp].setValue(&bVal, rType); - break;//"ChangeFraction", + break;//"AddNonBreakingSpace" case 9: bVal = 0 != (nFlags & ChgToEnEmDash); pValues[nProp].setValue(&bVal, rType); @@ -338,10 +334,6 @@ void SvxBaseAutoCorrCfg::Commit() case 16: pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetEndDoubleQuote(); break;//"DoubleQuoteAtEnd" - case 17: - bVal = 0 != (nFlags & AddNonBrkSpace); - pValues[nProp].setValue(&bVal, rType); - break;//"AddNonBreakingSpace" } } PutProperties(aNames, aValues); @@ -371,7 +363,7 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() "Format/Option/ChangeUnderlineWeight", // 8 "Format/Option/SetInetAttribute", // 9 "Format/Option/ChangeOrdinalNumber", //10 - "Format/Option/ChangeFraction", //11 + "Format/Option/AddNonBreakingSpace", //11 "Format/Option/ChangeDash", //12 "Format/Option/DelEmptyParagraphs", //13 "Format/Option/ReplaceUserStyle", //14 @@ -407,10 +399,9 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() "Format/ByInput/ApplyNumbering/SpecialCharacter/Font", //44 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily", //45 "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", //46 - "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //47 - "Format/Option/AddNonBreakingSpace" //48 + "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch" //47 }; - const int nCount = 49; + const int nCount = 48; Sequence<OUString> aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -448,7 +439,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) case 8: rSwFlags.bChgWeightUnderl = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeUnderlineWeight", case 9: rSwFlags.bSetINetAttr = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/SetInetAttribute", case 10: rSwFlags.bChgOrdinalNumber = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeOrdinalNumber", - case 11: rSwFlags.bChgFracionSymbol = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeFraction", + case 11 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/Output/AddNonBreakingSpace", // it doesn't exist here - the common flags are used for that -> LM // case 12: rSwFlags.bChgToEnEmDash = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeDash", case 13: rSwFlags.bDelEmptyNode = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelEmptyParagraphs", @@ -562,7 +553,6 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal)); } break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", - case 48 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/Output/AddNonBreakingSpace", } } } @@ -610,7 +600,7 @@ void SvxSwAutoCorrCfg::Commit() case 8: bVal = rSwFlags.bChgWeightUnderl; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeUnderlineWeight", case 9: bVal = rSwFlags.bSetINetAttr; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/SetInetAttribute", case 10: bVal = rSwFlags.bChgOrdinalNumber; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeOrdinalNumber", - case 11: bVal = rSwFlags.bChgFracionSymbol; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeFraction", + case 11: bVal = rSwFlags.bAddNonBrkSpace; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/AddNonBreakingSpace", // it doesn't exist here - the common flags are used for that -> LM case 12: bVal = sal_True; pValues[nProp].setValue(&bVal, rType); @@ -678,9 +668,6 @@ void SvxSwAutoCorrCfg::Commit() case 47 : pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch(); break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", - case 48: - bVal = rSwFlags.bAddNonBrkSpace; pValues[nProp].setValue(&bVal, rType); - break; // "Format/Option/AddNonBreakingSpace", } } PutProperties(aNames, aValues); diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index 71e2f8425c7d..95442fd44223 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -347,7 +347,6 @@ long SvxAutoCorrect::GetDefaultFlags() long nRet = Autocorrect | CptlSttSntnc | CptlSttWrd - | ChgFractionSymbol | ChgOrdinalNumber | ChgToEnEmDash | AddNonBrkSpace @@ -491,40 +490,6 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt, } -BOOL SvxAutoCorrect::FnChgFractionSymbol( - SvxAutoCorrDoc& rDoc, const String& rTxt, - xub_StrLen nSttPos, xub_StrLen nEndPos ) -{ - sal_Unicode cChar = 0; - - for( ; nSttPos < nEndPos; ++nSttPos ) - if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nSttPos ) )) - break; - for( ; nSttPos < nEndPos; --nEndPos ) - if( !lcl_IsInAsciiArr( sImplEndSkipChars, rTxt.GetChar( nEndPos - 1 ) )) - break; - - // 1/2, 1/4, ... ersetzen durch das entsprechende Zeichen vom Font - if( 3 == nEndPos - nSttPos && '/' == rTxt.GetChar( nSttPos+1 )) - { - switch( ( rTxt.GetChar( nSttPos )) * 256 + rTxt.GetChar( nEndPos-1 )) - { - case '1' * 256 + '2': cChar = c1Div2; break; - case '1' * 256 + '4': cChar = c1Div4; break; - case '3' * 256 + '4': cChar = c3Div4; break; - } - - if( cChar ) - { - // also austauschen: - rDoc.Delete( nSttPos+1, nEndPos ); - rDoc.Replace( nSttPos, cChar ); - } - } - return 0 != cChar; -} - - BOOL SvxAutoCorrect::FnChgOrdinalNumber( SvxAutoCorrDoc& rDoc, const String& rTxt, xub_StrLen nSttPos, xub_StrLen nEndPos, @@ -1350,9 +1315,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, } } - if( ( IsAutoCorrFlag( nRet = ChgFractionSymbol ) && - FnChgFractionSymbol( rDoc, rTxt, nCapLttrPos, nInsPos ) ) || - ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) && + if( ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) && FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) || ( IsAutoCorrFlag( nRet = AddNonBrkSpace ) && FnAddNonBrkSpace( rDoc, rTxt, nCapLttrPos, nInsPos - 1, eLang ) ) || @@ -1404,7 +1367,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, else if( nRet & SetINetAttr) nHelpId = 18; else if( nRet & IngnoreDoubleSpace) nHelpId = 19; else if( nRet & ChgWeightUnderl) nHelpId = 20; - else if( nRet & ChgFractionSymbol ) nHelpId = 21; + else if( nRet & AddNonBrkSpace) nHelpId = 21; else if( nRet & ChgOrdinalNumber) nHelpId = 22; } diff --git a/svx/source/editeng/swafopt.cxx b/svx/source/editeng/swafopt.cxx index 707f8b2a1561..bcb4a00d780e 100644 --- a/svx/source/editeng/swafopt.cxx +++ b/svx/source/editeng/swafopt.cxx @@ -51,7 +51,6 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bChkFontAttr = bChgUserColl = bChgEnumNum = - bChgFracionSymbol = bChgOrdinalNumber = bChgToEnEmDash = bChgWeightUnderl = @@ -115,7 +114,6 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla bSetNumRule = rAFFlags.bSetNumRule; bAFmtByInput = rAFFlags.bAFmtByInput; - bChgFracionSymbol = rAFFlags.bChgFracionSymbol; bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber; bChgToEnEmDash = rAFFlags.bChgToEnEmDash; bChgWeightUnderl = rAFFlags.bChgWeightUnderl; diff --git a/svx/util/hidother.src b/svx/util/hidother.src index 6ef00e2640a2..05fb0de55642 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -133,7 +133,7 @@ hidspecial HID_HYPERDLG_DOC_PATH { HelpID = HID_HYPERDLG_DOC_PATH ;}; #define HID_AUTOCORR_HELP_SETINETATTR HID_AUTOCORR_HELP_START+17 #define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE HID_AUTOCORR_HELP_START+18 #define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL HID_AUTOCORR_HELP_START+19 -#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL HID_AUTOCORR_HELP_START+20 +#define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 #define HID_AUTOCORR_HELP_CHGORDINALNUMBER HID_AUTOCORR_HELP_START+21 hidspecial HID_AUTOCORR_HELP_WORD { HelpID = HID_AUTOCORR_HELP_WORD;}; @@ -156,7 +156,7 @@ hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES { HelpID = HID_AUTOCORR_HELP_CH hidspecial HID_AUTOCORR_HELP_SETINETATTR { HelpID = HID_AUTOCORR_HELP_SETINETATTR;}; hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID = HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;}; hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL { HelpID = HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;}; -hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL { HelpID = HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;}; +hidspecial HID_AUTOCORR_HELP_CHGNONBRKSPACE { HelpID = HID_AUTOCORR_HELP_CHGNONBRKSPACE;}; hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER { HelpID = HID_AUTOCORR_HELP_CHGORDINALNUMBER;}; hidspecial HID_CLB_EDIT_MODULES_DICS { HelpID = HID_CLB_EDIT_MODULES_DICS ;}; @@ -343,6 +343,8 @@ hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK { HelpId = UID_OFA_CONNPOOL_ hidspecial HID_OFA_CONNPOOL_DRIVERLIST { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; }; hidspecial HID_DBPATH_CTL_PATH { HelpId = HID_DBPATH_CTL_PATH; }; hidspecial HID_DBPATH_HEADERBAR { HelpId = HID_DBPATH_HEADERBAR; }; +hidspecial HID_OFAPAGE_QUOTE_CLB { HelpId = HID_OFAPAGE_QUOTE_CLB; }; +hidspecial HID_OFAPAGE_QUOTE_SW_CLB { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; }; hidspecial HID_HANGULDLG_BUTTON_OPTIONS { HelpId = HID_HANGULDLG_BUTTON_OPTIONS; }; |