CWS-TOOLING: integrate CWS cbosdo01

6 files changed, 210 insertions, 88 deletions

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index dba6ce826cc3..a1c7c89adba3 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -116,8 +116,8 @@ private:
     String      sBoldUnderline;
     String      sURL;
     String      sNoDblSpaces;
-    String      sHalf;
     String      sDash;
+    String      sNonBrkSpace;
     String      sFirst;
 
 public:
@@ -151,15 +151,14 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     String          sUseReplaceTbl;
     String          sCptlSttWord;
     String          sCptlSttSent;
-    String          sTypo;
     String          sUserStyle;
     String          sBullet;
     String          sByInputBullet;
     String          sBoldUnder;
     String          sNoDblSpaces;
-    String          sFraction;
     String          sDetectURL;
     String          sDash;
+    String          sNonBrkSpace;
     String          sOrdinal;
     String          sRightMargin;
     String          sNum;
@@ -334,6 +333,18 @@ class OfaQuoteTabPage : public SfxTabPage
     using TabPage::ActivatePage;
 
 private:
+    // For anything but writer
+    SvxCheckListBox aCheckLB;
+
+    // Just for writer
+    OfaACorrCheckListBox    aSwCheckLB;
+    String          sHeader1;
+    String          sHeader2;
+
+    String          sNonBrkSpace;
+    String          sOrdinal;
+
+    SvLBoxButtonData*   pCheckButtonData;
 
     FixedLine   aSingleFL;
     CheckBox    aSingleTypoCB;
@@ -372,6 +383,8 @@ private:
 
     String              ChangeStringExt_Impl( sal_UCS4 );
 
+    SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+
                         OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
 public:
                         ~OfaQuoteTabPage();
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 74cb35e2b460..29a3fd48048f 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -374,6 +374,8 @@
 #define HID_GALLERY_ENTER_TITLE                     (HID_CUI_START + 336)
 #define HID_GALLERY_TITLE_EDIT                      (HID_CUI_START + 337)
 #define HID_THES_LANGUAGE                           (HID_CUI_START + 338)
+#define HID_OFAPAGE_QUOTE_SW_CLB                    (HID_CUI_START + 339)
+#define HID_OFAPAGE_QUOTE_CLB                       (HID_CUI_START + 340)
 
 // please adjust ACT_SVX_HID_END2 below if you add entries here!
 
@@ -381,7 +383,7 @@
 // Overrun check ---------------------------------------------------------
 // -----------------------------------------------------------------------
 
-#define ACT_CUI_HID_END     HID_CUI_START + 338
+#define ACT_CUI_HID_END     HID_CUI_START + 340
 
 #if ACT_CUI_HID_END > HID_CUI_END
 #error Resource-Ueberlauf in #line, #file
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index fcf05709b7cd..ab805fdd1e28 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -227,9 +227,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
     sBoldUnderline      (CUI_RES(ST_BOLD_UNDER        )),
     sURL                (CUI_RES(ST_DETECT_URL        )),
     sNoDblSpaces        (CUI_RES(STR_NO_DBL_SPACES    )),
-    sHalf               (CUI_RES(ST_FRACTION          )),
-    sDash               (CUI_RES(ST_DASH                )),
-    sFirst              (CUI_RES(ST_ORDINAL           ))
+    sDash               (CUI_RES(ST_DASH                ))
 {
     FreeResource();
 
@@ -271,10 +269,8 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
     pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc,         aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl,      aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(SetINetAttr,          aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,     aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol,    aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,        aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,   aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace,    aCheckLB.IsChecked(nPos++));
 
     BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
     if(bReturn )
@@ -312,8 +308,6 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.InsertEntry(sStartCap);
     aCheckLB.InsertEntry(sBoldUnderline);
     aCheckLB.InsertEntry(sURL);
-    aCheckLB.InsertEntry(sFirst);
-    aCheckLB.InsertEntry(sHalf);
     aCheckLB.InsertEntry(sDash);
     aCheckLB.InsertEntry(sNoDblSpaces);
 
@@ -323,10 +317,8 @@ 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 & ChgOrdinalNumber) );
-    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) );
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) );
-    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) );
+    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IgnoreDoubleSpace) );
 
     aCheckLB.SetUpdateMode(TRUE);
 }
@@ -453,8 +445,6 @@ enum OfaAutoFmtOptions
     BEGIN_UPPER,
     BOLD_UNDERLINE,
     DETECT_URL,
-    REPLACE_1ST,
-    REPLACE_HALF,
     REPLACE_DASHES,
     DEL_SPACES_AT_STT_END,
     DEL_SPACES_BETWEEN_LINES,
@@ -466,7 +456,6 @@ enum OfaAutoFmtOptions
     DEL_EMPTY_NODE,
     REPLACE_USER_COLL,
     REPLACE_BULLETS,
-    REPLACE_QUOTATION,
     MERGE_SINGLE_LINE_PARA
 };
 
@@ -483,15 +472,12 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
     sUseReplaceTbl      (CUI_RES(   ST_USE_REPLACE  )),
     sCptlSttWord        (CUI_RES(   ST_CPTL_STT_WORD)),
     sCptlSttSent        (CUI_RES(   ST_CPTL_STT_SENT)),
-    sTypo               (CUI_RES(   ST_TYPO         )),
     sUserStyle          (CUI_RES(   ST_USER_STYLE   )),
     sBullet             (CUI_RES(   ST_BULLET       )),
     sBoldUnder          (CUI_RES(   ST_BOLD_UNDER   )),
     sNoDblSpaces        (CUI_RES(   STR_NO_DBL_SPACES)),
-    sFraction           (CUI_RES(   ST_FRACTION     )),
     sDetectURL          (CUI_RES(   ST_DETECT_URL   )),
     sDash               (CUI_RES(   ST_DASH         )),
-    sOrdinal            (CUI_RES(   ST_ORDINAL      )),
     sRightMargin        (CUI_RES(   ST_RIGHT_MARGIN )),
     sNum                (CUI_RES(   STR_NUM         )),
     sBorder             (CUI_RES(   STR_BORDER      )),
@@ -508,11 +494,6 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
 
     //typ. Anfuehrungszeichen einsetzen
     SvtSysLocale aSysLcl;
-    const LocaleDataWrapper& rLcl = aSysLcl.GetLocaleData();
-    sTypo.SearchAndReplace( String::CreateFromAscii("%1"),
-                                        rLcl.getDoubleQuotationMarkStart());
-    sTypo.SearchAndReplace( String::CreateFromAscii("%2"),
-                                        rLcl.getDoubleQuotationMarkEnd());
 
     aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB);
     aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
@@ -625,7 +606,7 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
     pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl,
                         aCheckLB.IsChecked(BOLD_UNDERLINE, CBCOL_SECOND));
 
-    pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,
+    pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace,
                         aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND));
 
     bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST);
@@ -634,20 +615,10 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
     pAutoCorrect->SetAutoCorrFlag(SetINetAttr,
                         aCheckLB.IsChecked(DETECT_URL, CBCOL_SECOND));
 
-    bCheck = aCheckLB.IsChecked(REPLACE_1ST, CBCOL_FIRST);
-    bModified |= pOpt->bChgOrdinalNumber != bCheck;
-    pOpt->bChgOrdinalNumber = bCheck;
-    pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,
-                        aCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND));
-
     bCheck = aCheckLB.IsChecked(DEL_EMPTY_NODE, CBCOL_FIRST);
     bModified |= pOpt->bDelEmptyNode != bCheck;
     pOpt->bDelEmptyNode = bCheck;
 
-    bCheck = aCheckLB.IsChecked(REPLACE_QUOTATION, CBCOL_FIRST);
-    bModified |= pOpt->bReplaceQuote != bCheck;
-    pOpt->bReplaceQuote = bCheck;
-
     bCheck = aCheckLB.IsChecked(REPLACE_USER_COLL, CBCOL_FIRST);
     bModified |= pOpt->bChgUserColl != bCheck;
     pOpt->bChgUserColl = bCheck;
@@ -687,12 +658,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;
@@ -752,8 +717,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(sOrdinal,           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  ));
@@ -766,7 +729,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara,   CBCOL_FIRST ));
     aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle,         CBCOL_FIRST ));
     aCheckLB.GetModel()->Insert(CreateEntry(sBullet,            CBCOL_FIRST ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sTypo,              CBCOL_FIRST ));
     aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin,       CBCOL_FIRST ));
 
     aCheckLB.CheckEntryPos( USE_REPLACE_TABLE,  CBCOL_FIRST,    pOpt->bAutoCorrect );
@@ -777,13 +739,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.CheckEntryPos( BEGIN_UPPER,        CBCOL_SECOND,   0 != (nFlags & CptlSttSntnc) );
     aCheckLB.CheckEntryPos( BOLD_UNDERLINE,     CBCOL_FIRST,    pOpt->bChgWeightUnderl );
     aCheckLB.CheckEntryPos( BOLD_UNDERLINE,     CBCOL_SECOND,   0 != (nFlags & ChgWeightUnderl) );
-    aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,    CBCOL_SECOND,   0 != (nFlags & IngnoreDoubleSpace) );
+    aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,    CBCOL_SECOND,   0 != (nFlags & IgnoreDoubleSpace) );
     aCheckLB.CheckEntryPos( DETECT_URL,         CBCOL_FIRST,    pOpt->bSetINetAttr );
     aCheckLB.CheckEntryPos( DETECT_URL,         CBCOL_SECOND,   0 != (nFlags & SetINetAttr) );
-    aCheckLB.CheckEntryPos( REPLACE_1ST,        CBCOL_FIRST,    pOpt->bChgOrdinalNumber );
-    aCheckLB.CheckEntryPos( REPLACE_1ST,        CBCOL_SECOND,   0 != (nFlags & ChgOrdinalNumber) );
-    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 );
@@ -791,7 +749,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFmtDelSpacesBetweenLines );
     aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesBetweenLines );
     aCheckLB.CheckEntryPos( DEL_EMPTY_NODE,     CBCOL_FIRST,    pOpt->bDelEmptyNode );
-    aCheckLB.CheckEntryPos( REPLACE_QUOTATION,  CBCOL_FIRST,    pOpt->bReplaceQuote );
     aCheckLB.CheckEntryPos( REPLACE_USER_COLL,  CBCOL_FIRST,    pOpt->bChgUserColl );
     aCheckLB.CheckEntryPos( REPLACE_BULLETS,    CBCOL_FIRST,    pOpt->bChgEnumNum );
 
@@ -2035,8 +1992,50 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
 
 --------------------------------------------------*/
 
+enum OfaQuoteOptions
+{
+    ADD_NONBRK_SPACE,
+    REPLACE_1ST
+};
+
+SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol)
+{
+    SvLBoxEntry* pEntry = new SvLBoxEntry;
+
+    if ( !pCheckButtonData )
+    {
+        pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB );
+        aSwCheckLB.SetCheckButtonData( pCheckButtonData );
+    }
+
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+
+    String sEmpty;
+    if (nCol == CBCOL_SECOND)
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+    else
+        pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
+
+    if (nCol == CBCOL_FIRST)
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+    else
+        pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
+
+    pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) );
+
+    return pEntry;
+}
+
 OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
+    aCheckLB            (this, CUI_RES(CLB_SETTINGS     )),
+    aSwCheckLB          (this, CUI_RES(CLB_SETTINGS     )),
+    sHeader1            (CUI_RES( STR_HEADER1           )),
+    sHeader2            (CUI_RES( STR_HEADER2           )),
+    sNonBrkSpace        (CUI_RES( ST_NON_BREAK_SPACE    )),
+    sOrdinal            (CUI_RES( ST_ORDINAL            )),
+    pCheckButtonData    ( NULL ),
+
     aSingleFL           (this, CUI_RES(FL_SINGLE         )),
     aSingleTypoCB       (this, CUI_RES(CB_SGL_TYPO     )),
     aSglStartQuoteFT    (this, CUI_RES(FT_SGL_STARTQUOTE )),
@@ -2064,6 +2063,38 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
 {
     FreeResource();
 
+    BOOL bShowSWOptions = FALSE;
+
+    aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB );
+    aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB );
+
+    SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE );
+    if ( pItem && pItem->GetValue() )
+        bShowSWOptions = TRUE;
+
+    if ( bShowSWOptions )
+    {
+        static long aStaticTabs[]=
+        {
+            3, 0, 20, 40
+        };
+
+        aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
+
+        aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs);
+        String sHeader( sHeader1 );
+        sHeader += '\t';
+        sHeader += sHeader2;
+        sHeader += '\t';
+        aSwCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND,
+                        HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED);
+        aCheckLB.Hide( TRUE );
+    }
+    else
+    {
+        aSwCheckLB.HideTable( );
+    }
+
     aStartQuotePB.SetClickHdl(LINK(this,    OfaQuoteTabPage, QuoteHdl));
     aEndQuotePB.SetClickHdl(LINK(this,      OfaQuoteTabPage, QuoteHdl));
     aSglStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl));
@@ -2077,6 +2108,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
 --------------------------------------------------*/
 OfaQuoteTabPage::~OfaQuoteTabPage()
 {
+    delete( pCheckButtonData );
 }
 /*-----------------03.07.97 13:17-------------------
 
@@ -2094,6 +2126,32 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
 
     long nFlags = pAutoCorrect->GetFlags();
+
+    if ( aCheckLB.IsVisible( ) )
+    {
+        USHORT nPos = 0;
+        pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,       aCheckLB.IsChecked(nPos++));
+        pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,     aCheckLB.IsChecked(nPos++));
+    }
+
+    BOOL bModified = FALSE;
+    if ( aSwCheckLB.IsVisible( ) )
+    {
+        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+
+        BOOL bCheck = aSwCheckLB.IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
+        bModified |= pOpt->bAddNonBrkSpace != bCheck;
+        pOpt->bAddNonBrkSpace = bCheck;
+        pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,
+                            aSwCheckLB.IsChecked(ADD_NONBRK_SPACE, CBCOL_SECOND));
+
+        bCheck = aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_FIRST);
+        bModified |= pOpt->bChgOrdinalNumber != bCheck;
+        pOpt->bChgOrdinalNumber = bCheck;
+        pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,
+                        aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND));
+    }
+
     pAutoCorrect->SetAutoCorrFlag(ChgQuotes,        aTypoCB.IsChecked());
     pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes,     aSingleTypoCB.IsChecked());
     BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
@@ -2122,7 +2180,7 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
         pAutoCorrect->SetEndSingleQuote(cUCS2);
     }
 
-    if(bReturn )
+    if( bModified || bReturn )
     {
         SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
         pCfg->SetModified();
@@ -2145,6 +2203,42 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
     const long nFlags = pAutoCorrect->GetFlags();
 
+    // Initialize the Sw options
+    if ( aSwCheckLB.IsVisible( ) )
+    {
+        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+
+        aSwCheckLB.SetUpdateMode( FALSE );
+        aSwCheckLB.Clear();
+
+        aSwCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace,       CBCOL_BOTH ));
+        aSwCheckLB.GetModel()->Insert(CreateEntry(sOrdinal,           CBCOL_BOTH ));
+
+        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST,    pOpt->bAddNonBrkSpace );
+        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND,   0 != (nFlags & AddNonBrkSpace) );
+        aSwCheckLB.CheckEntryPos( REPLACE_1ST,      CBCOL_FIRST,    pOpt->bChgOrdinalNumber );
+        aSwCheckLB.CheckEntryPos( REPLACE_1ST,      CBCOL_SECOND,   0 != (nFlags & ChgOrdinalNumber) );
+
+        aSwCheckLB.SetUpdateMode( TRUE );
+    }
+
+    // Initialize the non Sw options
+    if ( aCheckLB.IsVisible( ) )
+    {
+        aCheckLB.SetUpdateMode( FALSE );
+        aCheckLB.Clear( );
+
+        aCheckLB.InsertEntry( sNonBrkSpace );
+        aCheckLB.InsertEntry( sOrdinal );
+
+        USHORT nPos = 0;
+        aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) );
+        aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) );
+
+        aCheckLB.SetUpdateMode( TRUE );
+    }
+
+    // Initialize the quote stuffs
     aTypoCB             .Check(0 != (nFlags & ChgQuotes));
     aSingleTypoCB       .Check(0 != (nFlags & ChgSglQuotes));
     aTypoCB             .SaveValue();
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index f1817b3f3f36..25da8a7e6453 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -148,7 +148,7 @@
 #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
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 030a47aae26b..77148ae6b1b3 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -73,7 +73,7 @@ TabDialog RID_OFA_AUTOCORR_DLG
             PageItem
             {
                 Identifier = RID_OFAPAGE_AUTOCORR_QUOTE ;
-                Text [ en-US ] = "Custom Quotes" ;
+                Text [ en-US ] = "Localized Options" ;
             };
             PageItem
             {
@@ -129,14 +129,6 @@ TabDialog RID_OFA_AUTOCORR_DLG
     { \
         Text [ en-US ] = "URL Recognition" ; \
     }; \
-    String ST_ORDINAL \
-    { \
-        Text [ en-US ] = "Replace 1st... with 1^st..." ; \
-    }; \
-    String ST_FRACTION \
-    { \
-        Text [ en-US ] = "Replace 1/2 ... with ½ ..." ; \
-    }; \
     String ST_DASH \
     { \
         Text [ en-US ] = "Replace dashes" ; \
@@ -215,10 +207,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
         /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absőtze entfernen */
         Text [ en-US ] = "Remove blank paragraphs" ;
     };
-    String ST_TYPO
-    {
-        Text [ en-US ] = "Replace \"standard\" quotes with %1custom%2 quotes" ;
-    };
     String ST_USER_STYLE
     {
         Text [ en-US ] = "Replace Custom Styles" ;
@@ -494,114 +482,137 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
     Hide = TRUE ;
-    Text [ en-US ] = "Custom Quotes" ;
-    FixedLine FL_SINGLE
+    Text [ en-US ] = "Localized Options" ;
+    Control CLB_SETTINGS
     {
         Pos = MAP_APPFONT ( 4 , 3 ) ;
-        Size = MAP_APPFONT ( 252 , 8 ) ;
+        Size = MAP_APPFONT ( 252 , 85 ) ;
+        Border = TRUE ;
+        TabStop = TRUE ;
+    };
+    String STR_HEADER1
+    {
+        Text [ en-US ] = "[M]" ;
+    };
+    String STR_HEADER2
+    {
+        Text [ en-US ] = "[T]" ;
+    };
+    String ST_NON_BREAK_SPACE
+    {
+       Text [ en-US ] = "Add non breaking space before specific punctuation marks in french text" ;
+    };
+    String ST_ORDINAL
+    {
+        Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ;
+    };
+    FixedLine FL_SINGLE
+    {
+        Pos = MAP_APPFONT ( 4 , 90 ) ;
+        Size = MAP_APPFONT ( 122 , 8 ) ;
         Text [ en-US ] = "Single quotes" ;
     };
     Checkbox CB_SGL_TYPO
     {
-        Pos = MAP_APPFONT ( 7 , 14 ) ;
+        Pos = MAP_APPFONT ( 7 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         Text [ en-US ] = "Repla~ce" ;
     };
     FixedText FT_SGL_STARTQUOTE
     {
-        Pos = MAP_APPFONT ( 7 , 30 ) ;
+        Pos = MAP_APPFONT ( 7 , 114 ) ;
         Size = MAP_APPFONT ( 86 , 8 ) ;
         Text [ en-US ] = "~Start quote:" ;
     };
     PushButton PB_SGL_STARTQUOTE
     {
-        Pos = MAP_APPFONT ( 105 , 28 ) ;
+        Pos = MAP_APPFONT ( 10 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
         TabStop = TRUE ;
     };
     FixedText FT_SGSTEX
     {
-        Pos = MAP_APPFONT ( 124 , 30 ) ;
+        Pos = MAP_APPFONT ( 26 , 127 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
     };
     FixedText FT_SGL_ENDQUOTE
     {
-        Pos = MAP_APPFONT ( 7 , 46 ) ;
+        Pos = MAP_APPFONT ( 7 , 139 ) ;
         Size = MAP_APPFONT ( 86 , 8 ) ;
         Text [ en-US ] = "~End quote:" ;
     };
     PushButton PB_SGL_ENDQUOTE
     {
-        Pos = MAP_APPFONT ( 105 , 44 ) ;
+        Pos = MAP_APPFONT ( 10 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
         TabStop = TRUE ;
     };
     FixedText FT_SGENEX
     {
-        Pos = MAP_APPFONT ( 124 , 46 ) ;
+        Pos = MAP_APPFONT ( 26 , 153 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
     };
     PushButton PB_SGL_STD
     {
-        Pos = MAP_APPFONT ( 198 , 63 ) ;
+        Pos = MAP_APPFONT ( 7 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Default" ;
     };
     FixedLine FL_DOUBLE
     {
-        Pos = MAP_APPFONT ( 4 , 83 ) ;
-        Size = MAP_APPFONT ( 252 , 8 ) ;
+        Pos = MAP_APPFONT ( 134 , 90 ) ;
+        Size = MAP_APPFONT ( 122 , 8 ) ;
         Text [ en-US ] = "Double quotes" ;
     };
     CheckBox CB_TYPO
     {
-        Pos = MAP_APPFONT ( 7 , 94 ) ;
+        Pos = MAP_APPFONT ( 137 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Repl~ace" ;
     };
     FixedText FT_STARTQUOTE
     {
-        Pos = MAP_APPFONT ( 7 , 110 ) ;
+        Pos = MAP_APPFONT ( 137 , 114 ) ;
         Size = MAP_APPFONT ( 86 , 8 ) ;
         Text [ en-US ] = "Start q~uote:" ;
     };
     PushButton PB_STARTQUOTE
     {
-        Pos = MAP_APPFONT ( 105 , 108 ) ;
+        Pos = MAP_APPFONT ( 140 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
         TabStop = TRUE ;
     };
     FixedText FT_DBSTEX
     {
-        Pos = MAP_APPFONT ( 124 , 110 ) ;
+        Pos = MAP_APPFONT ( 156 , 127 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
     };
     FixedText FT_ENDQUOTE
     {
-        Pos = MAP_APPFONT ( 7 , 126 ) ;
+        Pos = MAP_APPFONT ( 137 , 139 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         Text [ en-US ] = "E~nd quote:" ;
     };
     PushButton PB_ENDQUOTE
     {
-        Pos = MAP_APPFONT ( 105 , 124 ) ;
+        Pos = MAP_APPFONT ( 140 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
         TabStop = TRUE ;
     };
     FixedText FT_DBECEX
     {
-        Pos = MAP_APPFONT ( 124 , 126 ) ;
+        Pos = MAP_APPFONT ( 156 , 153 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
     };
     PushButton PB_DBL_STD
     {
-        Pos = MAP_APPFONT ( 195 , 143 ) ;
+        Pos = MAP_APPFONT ( 137 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "De~fault" ;
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index 313161f7c3cd..b8114dd00de2 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -143,6 +143,8 @@ hidspecial HID_OFADLG_TREELISTBOX                   { HelpId = HID_OFADLG_TREELI
 hidspecial HID_OFAPAGE_AUTOCORR_CLB                 { HelpId = HID_OFAPAGE_AUTOCORR_CLB; };
 hidspecial HID_OFAPAGE_AUTOFORMAT_CLB               { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; };
 hidspecial HID_OFAPAGE_MSFLTR2_CLB                   { HelpId = HID_OFAPAGE_MSFLTR2_CLB             ; };
+hidspecial HID_OFAPAGE_QUOTE_CLB                    { HelpId = HID_OFAPAGE_QUOTE_CLB; };
+hidspecial HID_OFAPAGE_QUOTE_SW_CLB                 { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; };
 hidspecial HID_OFA_CONNPOOL_DRIVERLIST              { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
 hidspecial HID_OFA_FONT_SUBST_CLB                   { HelpId = HID_OFA_FONT_SUBST_CLB; };
 hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN    { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;};