Kaydet (Commit) dbf5cf4a authored tarafından Caolán McNamara's avatar Caolán McNamara

convert apply autofmt page to .ui

Change-Id: Ibe15351220420900d808cb65d934af1922429e82
üst 4e3f7d32
...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \ cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/acorexceptpage \ cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \ cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/applyautofmtpage \
cui/uiconfig/ui/areatabpage \ cui/uiconfig/ui/areatabpage \
cui/uiconfig/ui/asiantypography \ cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \ cui/uiconfig/ui/autocorrectdialog \
......
...@@ -126,14 +126,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage ...@@ -126,14 +126,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
{ {
using TabPage::ActivatePage; using TabPage::ActivatePage;
SvSimpleTableContainer m_aCheckLBContainer; OfaACorrCheckListBox* m_pCheckLB;
OfaACorrCheckListBox aCheckLB; PushButton* m_pEditPB;
PushButton aEditPB;
FixedText aHeader1Expl;
FixedText aHeader2Expl;
String sHeader1;
String sHeader2;
String sDeleteEmptyPara; String sDeleteEmptyPara;
String sUseReplaceTbl; String sUseReplaceTbl;
......
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
// autocor // autocor
#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) #define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) #define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
...@@ -420,6 +419,27 @@ ...@@ -420,6 +419,27 @@
#define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START + 1203) #define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START + 1203)
#define RID_SVXDLG_CERTPATH (RID_SVX_START + 1204) #define RID_SVXDLG_CERTPATH (RID_SVX_START + 1204)
#define RID_SVXSTR_USE_REPLACE (RID_SVX_START + 1205)
#define RID_SVXSTR_CPTL_STT_WORD (RID_SVX_START + 1206)
#define RID_SVXSTR_CPTL_STT_SENT (RID_SVX_START + 1207)
#define RID_SVXSTR_BOLD_UNDER (RID_SVX_START + 1208)
#define RID_SVXSTR_NO_DBL_SPACES (RID_SVX_START + 1209)
#define RID_SVXSTR_DETECT_URL (RID_SVX_START + 1210)
#define RID_SVXSTR_DASH (RID_SVX_START + 1211)
#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK (RID_SVX_START + 1212)
#define RID_SVXSTR_NON_BREAK_SPACE (RID_SVX_START + 1213)
#define RID_SVXSTR_ORDINAL (RID_SVX_START + 1214)
#define RID_SVXSTR_DEL_EMPTY_PARA (RID_SVX_START + 1215)
#define RID_SVXSTR_USER_STYLE (RID_SVX_START + 1216)
#define RID_SVXSTR_BULLET (RID_SVX_START + 1217)
#define RID_SVXSTR_RIGHT_MARGIN (RID_SVX_START + 1218)
#define RID_SVXSTR_NUM (RID_SVX_START + 1219)
#define RID_SVXSTR_BORDER (RID_SVX_START + 1220)
#define RID_SVXSTR_CREATE_TABLE (RID_SVX_START + 1221)
#define RID_SVXSTR_REPLACE_TEMPLATES (RID_SVX_START + 1222)
#define RID_SVXSTR_DEL_SPACES_AT_STT_END (RID_SVX_START + 1223)
#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 1224)
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -231,7 +231,6 @@ ...@@ -231,7 +231,6 @@
#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2" #define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2"
#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" #define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS" #define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE" #define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" #define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION" #define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
......
...@@ -180,14 +180,14 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, ...@@ -180,14 +180,14 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet), SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
aCheckLB (this, CUI_RES(CLB_SETTINGS )), aCheckLB (this, CUI_RES(CLB_SETTINGS )),
sInput (CUI_RES(ST_USE_REPLACE )), sInput (CUI_RES(RID_SVXSTR_USE_REPLACE )),
sDoubleCaps (CUI_RES(ST_CPTL_STT_WORD )), sDoubleCaps (CUI_RES(RID_SVXSTR_CPTL_STT_WORD )),
sStartCap (CUI_RES(ST_CPTL_STT_SENT )), sStartCap (CUI_RES(RID_SVXSTR_CPTL_STT_SENT )),
sBoldUnderline (CUI_RES(ST_BOLD_UNDER )), sBoldUnderline (CUI_RES(RID_SVXSTR_BOLD_UNDER )),
sURL (CUI_RES(ST_DETECT_URL )), sURL (CUI_RES(RID_SVXSTR_DETECT_URL )),
sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )), sNoDblSpaces (CUI_RES(RID_SVXSTR_NO_DBL_SPACES )),
sDash (CUI_RES(ST_DASH )), sDash (CUI_RES(RID_SVXSTR_DASH )),
sAccidentalCaps (CUI_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK)) sAccidentalCaps (CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
{ {
FreeResource(); FreeResource();
...@@ -393,63 +393,57 @@ enum OfaAutoFmtOptions ...@@ -393,63 +393,57 @@ enum OfaAutoFmtOptions
}; };
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
const SfxItemSet& rSet ) : const SfxItemSet& rSet )
SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet), : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", rSet)
m_aCheckLBContainer(this, CUI_RES(CLB_SETTINGS)), , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA))
aCheckLB(m_aCheckLBContainer), , sUseReplaceTbl(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
aEditPB (this, CUI_RES(PB_EDIT)), , sCptlSttWord(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)), , sCptlSttSent(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT))
aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)), , sUserStyle(CUI_RESSTR(RID_SVXSTR_USER_STYLE))
sHeader1 (CUI_RES( STR_HEADER1 )), , sBullet(CUI_RESSTR(RID_SVXSTR_BULLET))
sHeader2 (CUI_RES( STR_HEADER2 )), , sBoldUnder(CUI_RESSTR(RID_SVXSTR_BOLD_UNDER))
sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)), , sNoDblSpaces(CUI_RESSTR(RID_SVXSTR_NO_DBL_SPACES))
sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), , sCorrectCapsLock(CUI_RESSTR(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), , sDetectURL(CUI_RESSTR(RID_SVXSTR_DETECT_URL))
sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), , sDash(CUI_RESSTR(RID_SVXSTR_DASH))
sUserStyle (CUI_RES( ST_USER_STYLE )), , sRightMargin(CUI_RESSTR(RID_SVXSTR_RIGHT_MARGIN))
sBullet (CUI_RES( ST_BULLET )), , sNum(CUI_RESSTR(RID_SVXSTR_NUM))
sBoldUnder (CUI_RES( ST_BOLD_UNDER )), , sBorder(CUI_RESSTR(RID_SVXSTR_BORDER))
sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), , sTable(CUI_RESSTR(RID_SVXSTR_CREATE_TABLE))
sCorrectCapsLock (CUI_RES( ST_CORRECT_ACCIDENTAL_CAPS_LOCK)), , sReplaceTemplates(CUI_RESSTR(RID_SVXSTR_REPLACE_TEMPLATES))
sDetectURL (CUI_RES( ST_DETECT_URL )), , sDelSpaceAtSttEnd(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_AT_STT_END))
sDash (CUI_RES( ST_DASH )), , sDelSpaceBetweenLines(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), , nPercent(50)
sNum (CUI_RES( STR_NUM )), , pCheckButtonData(NULL)
sBorder (CUI_RES( STR_BORDER )), {
sTable (CUI_RES( STR_TABLE )), get(m_pEditPB, "edit");
sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)),
sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)), SvSimpleTableContainer* pCheckLBContainer(get<SvSimpleTableContainer>("list"));
sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)), Size aControlSize(248 , 149);
aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
nPercent ( 50 ), pCheckLBContainer->set_width_request(aControlSize.Width());
pCheckButtonData( NULL ) pCheckLBContainer->set_height_request(aControlSize.Height());
m_pCheckLB = new OfaACorrCheckListBox(*pCheckLBContainer);
{
FreeResource(); m_pCheckLB->SetStyle(m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL);
// set typ. inverted commas m_pCheckLB->SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl));
SvtSysLocale aSysLcl; m_pCheckLB->SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB);
aCheckLB.SetStyle(aCheckLB.GetStyle()|WB_HSCROLL| WB_VSCROLL);
aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl));
aCheckLB.SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
static long aStaticTabs[]= static long aStaticTabs[]=
{ {
3, 0, 20, 40 3, 0, 20, 40
}; };
aCheckLB.SvSimpleTable::SetTabs(aStaticTabs); m_pCheckLB->SvSimpleTable::SetTabs(aStaticTabs);
String sHeader( sHeader1 ); OUStringBuffer sHeader(get<Window>("m")->GetText());
sHeader += '\t'; sHeader.append('\t');
sHeader += sHeader2; sHeader.append(get<Window>("t")->GetText());
sHeader += '\t'; sHeader.append('\t');
aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND,
HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED);
aEditPB.SetClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl)); m_pEditPB->SetClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
} }
SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol) SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol)
...@@ -458,8 +452,8 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 n ...@@ -458,8 +452,8 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 n
if ( !pCheckButtonData ) if ( !pCheckButtonData )
{ {
pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); pCheckButtonData = new SvLBoxButtonData( m_pCheckLB );
aCheckLB.SetCheckButtonData( pCheckButtonData ); m_pCheckLB->SetCheckButtonData( pCheckButtonData );
} }
pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
...@@ -481,10 +475,11 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 n ...@@ -481,10 +475,11 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 n
OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
{ {
delete (ImpUserData*) aCheckLB.GetUserData( REPLACE_BULLETS ); delete (ImpUserData*) m_pCheckLB->GetUserData( REPLACE_BULLETS );
delete (ImpUserData*) aCheckLB.GetUserData( APPLY_NUMBERING ); delete (ImpUserData*) m_pCheckLB->GetUserData( APPLY_NUMBERING );
delete (ImpUserData*) aCheckLB.GetUserData( MERGE_SINGLE_LINE_PARA ); delete (ImpUserData*) m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA );
delete pCheckButtonData; delete pCheckButtonData;
delete m_pCheckLB;
} }
SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
...@@ -500,51 +495,51 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) ...@@ -500,51 +495,51 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags(); long nFlags = pAutoCorrect->GetFlags();
sal_Bool bCheck = aCheckLB.IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST); sal_Bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
bModified |= pOpt->bAutoCorrect != bCheck; bModified |= pOpt->bAutoCorrect != bCheck;
pOpt->bAutoCorrect = bCheck; pOpt->bAutoCorrect = bCheck;
pAutoCorrect->SetAutoCorrFlag(Autocorrect, pAutoCorrect->SetAutoCorrFlag(Autocorrect,
aCheckLB.IsChecked(USE_REPLACE_TABLE, CBCOL_SECOND)); m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(CORR_UPPER, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(CORR_UPPER, CBCOL_FIRST);
bModified |= pOpt->bCptlSttWrd != bCheck; bModified |= pOpt->bCptlSttWrd != bCheck;
pOpt->bCptlSttWrd = bCheck; pOpt->bCptlSttWrd = bCheck;
pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, pAutoCorrect->SetAutoCorrFlag(CptlSttWrd,
aCheckLB.IsChecked(CORR_UPPER, CBCOL_SECOND)); m_pCheckLB->IsChecked(CORR_UPPER, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(BEGIN_UPPER, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(BEGIN_UPPER, CBCOL_FIRST);
bModified |= pOpt->bCptlSttSntnc != bCheck; bModified |= pOpt->bCptlSttSntnc != bCheck;
pOpt->bCptlSttSntnc = bCheck; pOpt->bCptlSttSntnc = bCheck;
pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc,
aCheckLB.IsChecked(BEGIN_UPPER, CBCOL_SECOND)); m_pCheckLB->IsChecked(BEGIN_UPPER, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(BOLD_UNDERLINE, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(BOLD_UNDERLINE, CBCOL_FIRST);
bModified |= pOpt->bChgWeightUnderl != bCheck; bModified |= pOpt->bChgWeightUnderl != bCheck;
pOpt->bChgWeightUnderl = bCheck; pOpt->bChgWeightUnderl = bCheck;
pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl,
aCheckLB.IsChecked(BOLD_UNDERLINE, CBCOL_SECOND)); m_pCheckLB->IsChecked(BOLD_UNDERLINE, CBCOL_SECOND));
pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace,
aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND)); m_pCheckLB->IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND));
pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,
aCheckLB.IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND)); m_pCheckLB->IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(DETECT_URL, CBCOL_FIRST);
bModified |= pOpt->bSetINetAttr != bCheck; bModified |= pOpt->bSetINetAttr != bCheck;
pOpt->bSetINetAttr = bCheck; pOpt->bSetINetAttr = bCheck;
pAutoCorrect->SetAutoCorrFlag(SetINetAttr, pAutoCorrect->SetAutoCorrFlag(SetINetAttr,
aCheckLB.IsChecked(DETECT_URL, CBCOL_SECOND)); m_pCheckLB->IsChecked(DETECT_URL, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(DEL_EMPTY_NODE, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(DEL_EMPTY_NODE, CBCOL_FIRST);
bModified |= pOpt->bDelEmptyNode != bCheck; bModified |= pOpt->bDelEmptyNode != bCheck;
pOpt->bDelEmptyNode = bCheck; pOpt->bDelEmptyNode = bCheck;
bCheck = aCheckLB.IsChecked(REPLACE_USER_COLL, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(REPLACE_USER_COLL, CBCOL_FIRST);
bModified |= pOpt->bChgUserColl != bCheck; bModified |= pOpt->bChgUserColl != bCheck;
pOpt->bChgUserColl = bCheck; pOpt->bChgUserColl = bCheck;
bCheck = aCheckLB.IsChecked(REPLACE_BULLETS, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(REPLACE_BULLETS, CBCOL_FIRST);
bModified |= pOpt->bChgEnumNum != bCheck; bModified |= pOpt->bChgEnumNum != bCheck;
pOpt->bChgEnumNum = bCheck; pOpt->bChgEnumNum = bCheck;
bModified |= aBulletFont != pOpt->aBulletFont; bModified |= aBulletFont != pOpt->aBulletFont;
...@@ -557,45 +552,45 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) ...@@ -557,45 +552,45 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
pOpt->aByInputBulletFont = aByInputBulletFont; pOpt->aByInputBulletFont = aByInputBulletFont;
pOpt->cByInputBullet = sByInputBulletChar.GetChar(0); pOpt->cByInputBullet = sByInputBulletChar.GetChar(0);
bCheck = aCheckLB.IsChecked(MERGE_SINGLE_LINE_PARA, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(MERGE_SINGLE_LINE_PARA, CBCOL_FIRST);
bModified |= pOpt->bRightMargin != bCheck; bModified |= pOpt->bRightMargin != bCheck;
pOpt->bRightMargin = bCheck; pOpt->bRightMargin = bCheck;
bModified |= nPercent != pOpt->nRightMargin; bModified |= nPercent != pOpt->nRightMargin;
pOpt->nRightMargin = (sal_uInt8)nPercent; pOpt->nRightMargin = (sal_uInt8)nPercent;
bCheck = aCheckLB.IsChecked(APPLY_NUMBERING, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(APPLY_NUMBERING, CBCOL_SECOND);
bModified |= pOpt->bSetNumRule != bCheck; bModified |= pOpt->bSetNumRule != bCheck;
pOpt->bSetNumRule = bCheck; pOpt->bSetNumRule = bCheck;
bCheck = aCheckLB.IsChecked(INSERT_BORDER, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(INSERT_BORDER, CBCOL_SECOND);
bModified |= pOpt->bSetBorder != bCheck; bModified |= pOpt->bSetBorder != bCheck;
pOpt->bSetBorder = bCheck; pOpt->bSetBorder = bCheck;
bCheck = aCheckLB.IsChecked(CREATE_TABLE, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(CREATE_TABLE, CBCOL_SECOND);
bModified |= pOpt->bCreateTable != bCheck; bModified |= pOpt->bCreateTable != bCheck;
pOpt->bCreateTable = bCheck; pOpt->bCreateTable = bCheck;
bCheck = aCheckLB.IsChecked(REPLACE_STYLES, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(REPLACE_STYLES, CBCOL_SECOND);
bModified |= pOpt->bReplaceStyles != bCheck; bModified |= pOpt->bReplaceStyles != bCheck;
pOpt->bReplaceStyles = bCheck; pOpt->bReplaceStyles = bCheck;
bCheck = aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_FIRST);
bModified |= pOpt->bChgToEnEmDash != bCheck; bModified |= pOpt->bChgToEnEmDash != bCheck;
pOpt->bChgToEnEmDash = bCheck; pOpt->bChgToEnEmDash = bCheck;
pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,
aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_SECOND)); m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
bCheck = aCheckLB.IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck; bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
pOpt->bAFmtDelSpacesAtSttEnd = bCheck; pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
bCheck = aCheckLB.IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck; bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck; pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
bCheck = aCheckLB.IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST); bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck; bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
pOpt->bAFmtDelSpacesBetweenLines = bCheck; pOpt->bAFmtDelSpacesBetweenLines = bCheck;
bCheck = aCheckLB.IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND); bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck; bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck; pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
...@@ -620,92 +615,92 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) ...@@ -620,92 +615,92 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
const long nFlags = pAutoCorrect->GetFlags(); const long nFlags = pAutoCorrect->GetFlags();
aCheckLB.SetUpdateMode(sal_False); m_pCheckLB->SetUpdateMode(sal_False);
aCheckLB.Clear(); m_pCheckLB->Clear();
// The following entries have to be inserted in the same order // The following entries have to be inserted in the same order
// as in the OfaAutoFmtOptions-enum! // as in the OfaAutoFmtOptions-enum!
aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sCorrectCapsLock, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND)); m_pCheckLB->GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND));
aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST ));
aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); m_pCheckLB->GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST ));
aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); m_pCheckLB->GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST ));
aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); m_pCheckLB->GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST ));
aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); m_pCheckLB->CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect );
aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect)); m_pCheckLB->CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect));
aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd ); m_pCheckLB->CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd );
aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) ); m_pCheckLB->CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) );
aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc ); m_pCheckLB->CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc );
aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); m_pCheckLB->CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) );
aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl ); m_pCheckLB->CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl );
aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) ); m_pCheckLB->CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) );
aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) ); m_pCheckLB->CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) );
aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK, CBCOL_SECOND, 0 != (nFlags & CorrectCapsLock) ); m_pCheckLB->CheckEntryPos( CORRECT_CAPS_LOCK, CBCOL_SECOND, 0 != (nFlags & CorrectCapsLock) );
aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); m_pCheckLB->CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr );
aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); m_pCheckLB->CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) );
aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash );
aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) );
aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd );
aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd ); m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd );
aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines );
aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines );
aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode );
aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl );
aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); m_pCheckLB->CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum );
aBulletFont = pOpt->aBulletFont; aBulletFont = pOpt->aBulletFont;
sBulletChar = pOpt->cBullet; sBulletChar = pOpt->cBullet;
ImpUserData* pUserData = new ImpUserData(&sBulletChar, &aBulletFont); ImpUserData* pUserData = new ImpUserData(&sBulletChar, &aBulletFont);
aCheckLB.SetUserData( REPLACE_BULLETS, pUserData ); m_pCheckLB->SetUserData( REPLACE_BULLETS, pUserData );
nPercent = pOpt->nRightMargin; nPercent = pOpt->nRightMargin;
sMargin = " " + OUString::number( nPercent ) + "%"; sMargin = " " + OUString::number( nPercent ) + "%";
pUserData = new ImpUserData(&sMargin, 0); pUserData = new ImpUserData(&sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData ); m_pCheckLB->SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
aCheckLB.CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); m_pCheckLB->CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule );
aByInputBulletFont = pOpt->aByInputBulletFont; aByInputBulletFont = pOpt->aByInputBulletFont;
sByInputBulletChar = pOpt->cByInputBullet; sByInputBulletChar = pOpt->cByInputBullet;
ImpUserData* pUserData2 = new ImpUserData(&sByInputBulletChar, &aByInputBulletFont); ImpUserData* pUserData2 = new ImpUserData(&sByInputBulletChar, &aByInputBulletFont);
aCheckLB.SetUserData( APPLY_NUMBERING , pUserData2 ); m_pCheckLB->SetUserData( APPLY_NUMBERING , pUserData2 );
aCheckLB.CheckEntryPos( MERGE_SINGLE_LINE_PARA, CBCOL_FIRST, pOpt->bRightMargin ); m_pCheckLB->CheckEntryPos( MERGE_SINGLE_LINE_PARA, CBCOL_FIRST, pOpt->bRightMargin );
aCheckLB.CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder ); m_pCheckLB->CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder );
aCheckLB.CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); m_pCheckLB->CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable );
aCheckLB.CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); m_pCheckLB->CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles );
aCheckLB.SetUpdateMode(sal_True); m_pCheckLB->SetUpdateMode(sal_True);
} }
IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox) IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox)
{ {
aEditPB.Enable(0 != pBox->FirstSelected()->GetUserData()); m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData());
return 0; return 0;
} }
IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
{ {
sal_uLong nSelEntryPos = aCheckLB.GetSelectEntryPos(); sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos();
if( nSelEntryPos == REPLACE_BULLETS || if( nSelEntryPos == REPLACE_BULLETS ||
nSelEntryPos == APPLY_NUMBERING) nSelEntryPos == APPLY_NUMBERING)
{ {
SvxCharacterMap *pMapDlg = new SvxCharacterMap(this); SvxCharacterMap *pMapDlg = new SvxCharacterMap(this);
ImpUserData* pUserData = (ImpUserData*)aCheckLB.FirstSelected()->GetUserData(); ImpUserData* pUserData = (ImpUserData*)m_pCheckLB->FirstSelected()->GetUserData();
pMapDlg->SetCharFont(*pUserData->pFont); pMapDlg->SetCharFont(*pUserData->pFont);
pMapDlg->SetChar( pUserData->pString->GetChar(0) ); pMapDlg->SetChar( pUserData->pString->GetChar(0) );
if(RET_OK == pMapDlg->Execute()) if(RET_OK == pMapDlg->Execute())
...@@ -730,7 +725,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) ...@@ -730,7 +725,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
sMargin = " " + OUString::number( nPercent ) + "%"; sMargin = " " + OUString::number( nPercent ) + "%";
} }
} }
aCheckLB.Invalidate(); m_pCheckLB->Invalidate();
return 0; return 0;
} }
...@@ -1737,10 +1732,10 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : ...@@ -1737,10 +1732,10 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
aCheckLB (this, CUI_RES(CLB_SETTINGS )), aCheckLB (this, CUI_RES(CLB_SETTINGS )),
m_aSwCheckLBContainer(this, CUI_RES(CLB_SETTINGS)), m_aSwCheckLBContainer(this, CUI_RES(CLB_SETTINGS)),
aSwCheckLB(m_aSwCheckLBContainer), aSwCheckLB(m_aSwCheckLBContainer),
sHeader1 (CUI_RES( STR_HEADER1 )), sHeader1 (CUI_RESSTR( STR_HEADER1 )),
sHeader2 (CUI_RES( STR_HEADER2 )), sHeader2 (CUI_RESSTR( STR_HEADER2 )),
sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), sNonBrkSpace (CUI_RESSTR( RID_SVXSTR_NON_BREAK_SPACE )),
sOrdinal (CUI_RES( ST_ORDINAL )), sOrdinal (CUI_RESSTR( RID_SVXSTR_ORDINAL )),
pCheckButtonData ( NULL ), pCheckButtonData ( NULL ),
aSingleFL (this, CUI_RES(FL_SINGLE )), aSingleFL (this, CUI_RES(FL_SINGLE )),
......
...@@ -49,25 +49,9 @@ ...@@ -49,25 +49,9 @@
#define CB_SGL_TYPO 57 #define CB_SGL_TYPO 57
#define ST_STANDARD 58 #define ST_STANDARD 58
#define PB_EDIT 61
#define ST_DEL_EMPTY_PARA 62
#define ST_USER_STYLE 67
#define ST_BULLET 68
#define STR_DEL_SPACES_AT_STT_END 69
#define STR_DEL_SPACES_BETWEEN_LINES 70
#define ST_RIGHT_MARGIN 74
#define STR_NUM 75
#define STR_BORDER 76
#define STR_TABLE 77
#define STR_REPLACE_TEMPLATES 78
#define FL_PRCNT 79
#define STR_HEADER 90 #define STR_HEADER 90
#define STR_HEADER1 92 #define STR_HEADER1 92
#define STR_HEADER2 93 #define STR_HEADER2 93
#define FT_HEADER1_EXPLANATION 94
#define FT_HEADER2_EXPLANATION 95
#define ED_RIGHT_MARGIN 100 #define ED_RIGHT_MARGIN 100
#define BT_OK 101 #define BT_OK 101
...@@ -87,18 +71,8 @@ ...@@ -87,18 +71,8 @@
#define LB_ENTRIES 132 #define LB_ENTRIES 132
#define PB_ENTRIES 133 #define PB_ENTRIES 133
#define ST_USE_REPLACE 200
#define ST_CPTL_STT_WORD 201
#define ST_CPTL_STT_SENT 202
#define ST_BOLD_UNDER 203
#define STR_NO_DBL_SPACES 204
#define ST_DETECT_URL 205
#define ST_ORDINAL 206
#define ST_NON_BREAK_SPACE 207
#define ST_DASH 208
#define FT_LANG 209 #define FT_LANG 209
#define LB_LANG 210 #define LB_LANG 210
#define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211
#define CB_SMARTTAGS 220 #define CB_SMARTTAGS 220
#define FT_SMARTTAGS 221 #define FT_SMARTTAGS 221
......
...@@ -22,40 +22,6 @@ ...@@ -22,40 +22,6 @@
#include "helpid.hrc" #include "helpid.hrc"
#include <svx/svxids.hrc> // SID_AUTOFORMAT #include <svx/svxids.hrc> // SID_AUTOFORMAT
#define COMMON_CLB_ENTRIES \
String ST_USE_REPLACE \
{ \
Text [ en-US ] = "Use replacement table" ; \
}; \
String ST_CPTL_STT_WORD \
{ \
Text [ en-US ] = "Correct TWo INitial CApitals" ; \
}; \
String ST_CPTL_STT_SENT \
{ \
Text [ en-US ] = "Capitalize first letter of every sentence" ; \
}; \
String ST_BOLD_UNDER \
{ \
Text [ en-US ] = "Automatic *bold* and _underline_" ; \
}; \
String STR_NO_DBL_SPACES \
{ \
Text [ en-US ] = "Ignore double spaces" ; \
}; \
String ST_DETECT_URL \
{ \
Text [ en-US ] = "URL Recognition" ; \
}; \
String ST_DASH \
{ \
Text [ en-US ] = "Replace dashes" ; \
}; \
String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \
{ \
Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \
};
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* Beschreibung: Autokorrektur-Optionen */ /* Beschreibung: Autokorrektur-Optionen */
...@@ -76,91 +42,6 @@ TabPage RID_OFAPAGE_AUTOCORR_OPTIONS ...@@ -76,91 +42,6 @@ TabPage RID_OFAPAGE_AUTOCORR_OPTIONS
Border = TRUE ; Border = TRUE ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
COMMON_CLB_ENTRIES
};
TabPage RID_OFAPAGE_AUTOFMT_APPLY
{
HelpID = HID_OFAPAGE_AUTOFMT_OPTIONS ;
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Control CLB_SETTINGS
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 248 , 149 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
PushButton PB_EDIT
{
HelpID = "cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT";
Pos = MAP_APPFONT ( 6 , 162 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Edit..." ;
TabStop = TRUE ;
};
String STR_HEADER1
{
Text [ en-US ] = "[M]" ;
};
String STR_HEADER2
{
Text [ en-US ] = "[T]" ;
};
FixedText FT_HEADER1_EXPLANATION
{
Pos = MAP_APPFONT ( 80 , 159 ) ;
Size = MAP_APPFONT ( 174 , 8 ) ;
Text [ en-US ] = "[M]: Replace while modifying existing text" ;
};
FixedText FT_HEADER2_EXPLANATION
{
Pos = MAP_APPFONT ( 80 , 171 ) ;
Size = MAP_APPFONT ( 174 , 8 ) ;
Text [ en-US ] = "[T]: AutoFormat/AutoCorrect while typing" ;
};
COMMON_CLB_ENTRIES
String ST_DEL_EMPTY_PARA
{
Text [ en-US ] = "Remove blank paragraphs" ;
};
String ST_USER_STYLE
{
Text [ en-US ] = "Replace Custom Styles" ;
};
String ST_BULLET
{
Text [ en-US ] = "Replace bullets with: " ;
};
String ST_RIGHT_MARGIN
{
Text [ en-US ] = "Combine single line paragraphs if length greater than" ;
};
String STR_NUM
{
Text [ en-US ] = "Apply numbering - symbol: " ;
};
String STR_BORDER
{
Text [ en-US ] = "Apply border" ;
};
String STR_TABLE
{
Text [ en-US ] = "Create table" ;
};
String STR_REPLACE_TEMPLATES
{
Text [ en-US ] = "Apply Styles" ;
};
String STR_DEL_SPACES_AT_STT_END
{
Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph";
};
String STR_DEL_SPACES_BETWEEN_LINES
{
Text [ en-US ] = "Delete spaces and tabs at end and start of line";
};
}; };
/**************************************************************************/ /**************************************************************************/
...@@ -191,14 +72,6 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE ...@@ -191,14 +72,6 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
{ {
Text [ en-US ] = "[T]" ; 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 FixedLine FL_SINGLE
{ {
Pos = MAP_APPFONT ( 4 , 90 ) ; Pos = MAP_APPFONT ( 4 , 90 ) ;
......
...@@ -147,5 +147,85 @@ String RID_SVXSTR_CHARNAME_TYPEFACE ...@@ -147,5 +147,85 @@ String RID_SVXSTR_CHARNAME_TYPEFACE
{ {
Text [ en-US ] = "Typeface"; Text [ en-US ] = "Typeface";
}; };
String RID_SVXSTR_USE_REPLACE
{
Text [ en-US ] = "Use replacement table" ;
};
String RID_SVXSTR_CPTL_STT_WORD
{
Text [ en-US ] = "Correct TWo INitial CApitals" ;
};
String RID_SVXSTR_CPTL_STT_SENT
{
Text [ en-US ] = "Capitalize first letter of every sentence" ;
};
String RID_SVXSTR_BOLD_UNDER
{
Text [ en-US ] = "Automatic *bold* and _underline_" ;
};
String RID_SVXSTR_NO_DBL_SPACES
{
Text [ en-US ] = "Ignore double spaces" ;
};
String RID_SVXSTR_DETECT_URL
{
Text [ en-US ] = "URL Recognition" ;
};
String RID_SVXSTR_DASH
{
Text [ en-US ] = "Replace dashes" ;
};
String RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK
{
Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ;
};
String RID_SVXSTR_NON_BREAK_SPACE
{
Text [ en-US ] = "Add non breaking space before specific punctuation marks in french text" ;
};
String RID_SVXSTR_ORDINAL
{
Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ;
};
String RID_SVXSTR_DEL_EMPTY_PARA
{
Text [ en-US ] = "Remove blank paragraphs" ;
};
String RID_SVXSTR_USER_STYLE
{
Text [ en-US ] = "Replace Custom Styles" ;
};
String RID_SVXSTR_BULLET
{
Text [ en-US ] = "Replace bullets with: " ;
};
String RID_SVXSTR_RIGHT_MARGIN
{
Text [ en-US ] = "Combine single line paragraphs if length greater than" ;
};
String RID_SVXSTR_NUM
{
Text [ en-US ] = "Apply numbering - symbol: " ;
};
String RID_SVXSTR_BORDER
{
Text [ en-US ] = "Apply border" ;
};
String RID_SVXSTR_CREATE_TABLE
{
Text [ en-US ] = "Create table" ;
};
String RID_SVXSTR_REPLACE_TEMPLATES
{
Text [ en-US ] = "Apply Styles" ;
};
String RID_SVXSTR_DEL_SPACES_AT_STT_END
{
Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph";
};
String RID_SVXSTR_DEL_SPACES_BETWEEN_LINES
{
Text [ en-US ] = "Delete spaces and tabs at end and start of line";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="ApplyAutoFmtPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="edit">
<property name="label" translatable="yes">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">[M]: Replace while modifying existing text</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">[T]: AutoFormat/AutoCorrect while typing</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="m">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">[M]</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="t">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">[T]</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvSimpleTableContainer" id="list">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Simple Table Container-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment