Skip to content

C
core
Kaydet (Commit) ce8b87b0 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

adapt sort-dialog code to use new layout 

Change-Id: I925ebfaf1343be84d47736bd0d5703adfd1692d7
üst 09d7f549
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 550 deletions
sw/UI_swriter.mk
Dosyayı görüntüle @ ce8b87b0
...@@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\ ...@@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/inserttable \ sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \ sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/printeroptions \ sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \ sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/stringinput \ sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/titlepage \ sw/uiconfig/swriter/ui/titlepage \
......
sw/source/ui/app/app.src
Dosyayı görüntüle @ ce8b87b0
...@@ -640,6 +640,21 @@ String STR_INVALID_AUTOFORMAT_NAME ...@@ -640,6 +640,21 @@ String STR_INVALID_AUTOFORMAT_NAME
Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ; Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ;
}; };
String STR_NUMERIC
{
Text [ en-US ] = "Numeric";
};
String STR_ROW
{
Text [ en-US ] = "Rows" ;
};
String STR_COL
{
Text [ en-US ] = "Column" ;
};
ToolBox RID_MODULE_TOOLBOX ToolBox RID_MODULE_TOOLBOX
{ {
HelpID = HID_MODULE_TOOLBOX ; HelpID = HID_MODULE_TOOLBOX ;
......
sw/source/ui/inc/app.hrc
Dosyayı görüntüle @ ce8b87b0
...@@ -111,8 +111,11 @@ ...@@ -111,8 +111,11 @@
#define STR_MID (RC_APP_BEGIN + 123) #define STR_MID (RC_APP_BEGIN + 123)
#define STR_SOUTH (RC_APP_BEGIN + 124) #define STR_SOUTH (RC_APP_BEGIN + 124)
#define STR_SUM (RC_APP_BEGIN + 125) #define STR_SUM (RC_APP_BEGIN + 125)
#define STR_NUMERIC (RC_APP_BEGIN + 126)
#define STR_COL (RC_APP_BEGIN + 127)
#define STR_ROW (RC_APP_BEGIN + 128)
#define APP_ACT_END STR_SUM #define APP_ACT_END STR_ROW
#if APP_ACT_END > RC_APP_END #if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line #error Resource-Id Ueberlauf in #file, #line
......
sw/source/ui/inc/srtdlg.hxx
Dosyayı görüntüle @ ce8b87b0
...@@ -40,49 +40,38 @@ class CollatorResource; ...@@ -40,49 +40,38 @@ class CollatorResource;
class SwSortDlg : public SvxStandardDialog class SwSortDlg : public SvxStandardDialog
{ {
FixedText aColLbl; FixedText* m_pColLbl;
FixedText aTypLbl; FixedText* m_pTypLbl;
FixedText aDirLbl;
CheckBox* m_pKeyCB1;
FixedLine aSortFL; NumericField* m_pColEdt1;
ListBox* m_pTypDLB1;
CheckBox aKeyCB1; RadioButton* m_pSortUp1RB;
NumericField aColEdt1; RadioButton* m_pSortDn1RB;
ListBox aTypDLB1;
RadioButton aSortUpRB; CheckBox* m_pKeyCB2;
RadioButton aSortDnRB; NumericField* m_pColEdt2;
ListBox* m_pTypDLB2;
CheckBox aKeyCB2; RadioButton* m_pSortUp2RB;
NumericField aColEdt2; RadioButton* m_pSortDn2RB;
ListBox aTypDLB2;
RadioButton aSortUp2RB; CheckBox* m_pKeyCB3;
RadioButton aSortDn2RB; NumericField* m_pColEdt3;
ListBox* m_pTypDLB3;
CheckBox aKeyCB3; RadioButton* m_pSortUp3RB;
NumericField aColEdt3; RadioButton* m_pSortDn3RB;
ListBox aTypDLB3;
RadioButton aSortUp3RB; RadioButton* m_pColumnRB;
RadioButton aSortDn3RB; RadioButton* m_pRowRB;
FixedLine aDirFL; RadioButton* m_pDelimTabRB;
RadioButton aColumnRB; RadioButton* m_pDelimFreeRB;
RadioButton aRowRB; Edit* m_pDelimEdt;
PushButton* m_pDelimPB;
FixedLine aDelimFL;
RadioButton aDelimTabRB; SvxLanguageBox* m_pLangLB;
RadioButton aDelimFreeRB;
Edit aDelimEdt; CheckBox* m_pCaseCB;
PushButton aDelimPB;
FixedLine aLangFL;
SvxLanguageBox aLangLB;
FixedLine aSortOptFL;
CheckBox aCaseCB;
OKButton aOkBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
String aColTxt; String aColTxt;
String aRowTxt; String aRowTxt;
......
sw/source/ui/misc/srtdlg.cxx
Dosyayı görüntüle @ ce8b87b0
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <cmdid.h> #include <cmdid.h>
#include <wrtsh.hxx> #include <wrtsh.hxx>
#include <misc.hrc> #include <misc.hrc>
#include <srtdlg.hrc> #include <app.hrc>
#include <swtable.hxx> #include <swtable.hxx>
#include <node.hxx> #include <node.hxx>
#include <tblsel.hxx> #include <tblsel.hxx>
...@@ -115,187 +115,172 @@ sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) ...@@ -115,187 +115,172 @@ sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Description: init list Description: init list
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
: SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui")
SvxStandardDialog(pParent, SW_RES(DLG_SORTING)), , aColTxt(SW_RES(STR_COL))
, aRowTxt(SW_RES(STR_ROW))
aColLbl(this, SW_RES(FT_COL )), , aNumericTxt(SW_RES(STR_NUMERIC))
aTypLbl(this, SW_RES(FT_KEYTYP)), , rSh(rShell)
aDirLbl(this, SW_RES(FT_DIR )), , pColRes(0)
aSortFL(this, SW_RES(FL_SORT_2 )), , nX(99)
, nY(99)
aKeyCB1(this, SW_RES(CB_KEY1 )),
aColEdt1(this, SW_RES(ED_KEY1 )),
aTypDLB1(this, SW_RES(DLB_KEY1 )),
aSortUpRB(this, SW_RES(RB_UP )),
aSortDnRB(this, SW_RES(RB_DN )),
aKeyCB2(this, SW_RES(CB_KEY2 )),
aColEdt2(this, SW_RES(ED_KEY2 )),
aTypDLB2(this, SW_RES(DLB_KEY2 )),
aSortUp2RB(this, SW_RES(RB_UP2 )),
aSortDn2RB(this, SW_RES(RB_DN2 )),
aKeyCB3(this, SW_RES(CB_KEY3 )),
aColEdt3(this, SW_RES(ED_KEY3 )),
aTypDLB3(this, SW_RES(DLB_KEY3 )),
aSortUp3RB(this, SW_RES(RB_UP3 )),
aSortDn3RB(this, SW_RES(RB_DN3 )),
aDirFL(this, SW_RES(FL_DIR )),
aColumnRB(this, SW_RES(RB_COL )),
aRowRB(this, SW_RES(RB_ROW )),
aDelimFL(this, SW_RES(FL_DELIM )),
aDelimTabRB(this, SW_RES(RB_TAB )),
aDelimFreeRB(this, SW_RES(RB_TABCH )),
aDelimEdt(this, SW_RES(ED_TABCH )),
aDelimPB(this, SW_RES( PB_DELIM)),
aLangFL(this, SW_RES( FL_LANG )),
aLangLB(this, SW_RES( LB_LANG )),
aSortOptFL(this, SW_RES( FL_SORT )),
aCaseCB(this, SW_RES( CB_CASE )),
aOkBtn(this, SW_RES(BT_OK )),
aCancelBtn(this, SW_RES(BT_CANCEL)),
aHelpBtn(this, SW_RES(BT_HELP )),
aColTxt( SW_RES(STR_COL)),
aRowTxt( SW_RES(STR_ROW)),
aNumericTxt( SW_RES(STR_NUMERIC)),
rSh(rShell),
pColRes( 0 ),
nX( 99 ),
nY( 99 )
{ {
aColEdt1.SetAccessibleName(aColLbl.GetText()); get(m_pColLbl, "column");
aColEdt2.SetAccessibleName(aColLbl.GetText()); get(m_pTypLbl, "keytype");
aColEdt3.SetAccessibleName(aColLbl.GetText());
aTypDLB1.SetAccessibleName(aTypLbl.GetText()); get(m_pKeyCB1, "key1");
aTypDLB2.SetAccessibleName(aTypLbl.GetText()); get(m_pColEdt1, "colsb1");
aTypDLB3.SetAccessibleName(aTypLbl.GetText()); get(m_pTypDLB1, "typelb1");
aSortUpRB.SetAccessibleRelationMemberOf( &aKeyCB1 ); get(m_pSortUp1RB, "up1");
aSortDnRB.SetAccessibleRelationMemberOf( &aKeyCB1 ); get(m_pSortDn1RB, "down1");
aSortUp2RB.SetAccessibleRelationMemberOf( &aKeyCB2 );
aSortDn2RB.SetAccessibleRelationMemberOf( &aKeyCB2 ); get(m_pKeyCB2, "key2");
aSortUp3RB.SetAccessibleRelationMemberOf( &aKeyCB3 ); get(m_pColEdt2, "colsb2");
aSortDn3RB.SetAccessibleRelationMemberOf( &aKeyCB3 ); get(m_pTypDLB2, "typelb2");
get(m_pSortUp2RB, "up2");
aDelimEdt.SetMaxTextLen( 1 ); get(m_pSortDn2RB, "down2");
get(m_pKeyCB3, "key3");
get(m_pColEdt3, "colsb3");
get(m_pTypDLB3, "typelb3");
get(m_pSortUp3RB, "up3");
get(m_pSortDn3RB, "down3");
get(m_pColumnRB, "columns");
get(m_pRowRB, "rows");
get(m_pDelimTabRB, "tabs");
get(m_pDelimFreeRB, "character");
get(m_pDelimEdt, "separator");
get(m_pDelimPB, "delimpb");
get(m_pLangLB, "langlb");
get(m_pCaseCB, "matchcase");
m_pColEdt1->SetAccessibleName(m_pColLbl->GetText());
m_pColEdt2->SetAccessibleName(m_pColLbl->GetText());
m_pColEdt3->SetAccessibleName(m_pColLbl->GetText());
m_pTypDLB1->SetAccessibleName(m_pTypLbl->GetText());
m_pTypDLB2->SetAccessibleName(m_pTypLbl->GetText());
m_pTypDLB3->SetAccessibleName(m_pTypLbl->GetText());
m_pSortUp1RB->SetAccessibleRelationMemberOf(m_pKeyCB1);
m_pSortDn1RB->SetAccessibleRelationMemberOf(m_pKeyCB1);
m_pSortUp2RB->SetAccessibleRelationMemberOf(m_pKeyCB2);
m_pSortDn2RB->SetAccessibleRelationMemberOf(m_pKeyCB2);
m_pSortUp3RB->SetAccessibleRelationMemberOf(m_pKeyCB3);
m_pSortDn3RB->SetAccessibleRelationMemberOf(m_pKeyCB3);
m_pDelimEdt->SetMaxTextLen( 1 );
if(rSh.GetSelectionType() & if(rSh.GetSelectionType() &
(nsSelectionType::SEL_TBL|nsSelectionType::SEL_TBL_CELLS) ) (nsSelectionType::SEL_TBL|nsSelectionType::SEL_TBL_CELLS) )
{ {
aColumnRB.Check(bCol); m_pColumnRB->Check(bCol);
aColLbl.SetText(bCol ? aRowTxt : aColTxt); m_pColLbl->SetText(bCol ? aRowTxt : aColTxt);
aRowRB.Check(!bCol); m_pRowRB->Check(!bCol);
aDelimTabRB.Enable(sal_False); m_pDelimTabRB->Enable(sal_False);
aDelimFreeRB.Enable(sal_False); m_pDelimFreeRB->Enable(sal_False);
aDelimEdt.Enable(sal_False); m_pDelimEdt->Enable(sal_False);
} }
else else
{ {
aColumnRB.Enable(sal_False); m_pColumnRB->Enable(sal_False);
aRowRB.Check(sal_True); m_pRowRB->Check(sal_True);
aColLbl.SetText(aColTxt); m_pColLbl->SetText(aColTxt);
} }
// initialise // initialise
Link aLk = LINK(this,SwSortDlg, CheckHdl); Link aLk = LINK(this,SwSortDlg, CheckHdl);
aKeyCB1.SetClickHdl( aLk ); m_pKeyCB1->SetClickHdl( aLk );
aKeyCB2.SetClickHdl( aLk ); m_pKeyCB2->SetClickHdl( aLk );
aKeyCB3.SetClickHdl( aLk ); m_pKeyCB3->SetClickHdl( aLk );
aColumnRB.SetClickHdl( aLk ); m_pColumnRB->SetClickHdl( aLk );
aRowRB.SetClickHdl( aLk ); m_pRowRB->SetClickHdl( aLk );
aLk = LINK(this,SwSortDlg, DelimHdl); aLk = LINK(this,SwSortDlg, DelimHdl);
aDelimFreeRB.SetClickHdl(aLk); m_pDelimFreeRB->SetClickHdl(aLk);
aDelimTabRB.SetClickHdl(aLk); m_pDelimTabRB->SetClickHdl(aLk);
aDelimPB.SetClickHdl( LINK( this, SwSortDlg, DelimCharHdl )); m_pDelimPB->SetClickHdl( LINK( this, SwSortDlg, DelimCharHdl ));
aKeyCB1.Check(bCheck1); m_pKeyCB1->Check(bCheck1);
aKeyCB2.Check(bCheck2); m_pKeyCB2->Check(bCheck2);
aKeyCB3.Check(bCheck3); m_pKeyCB3->Check(bCheck3);
aColEdt1.SetValue(nCol1); m_pColEdt1->SetValue(nCol1);
aColEdt2.SetValue(nCol2); m_pColEdt2->SetValue(nCol2);
aColEdt3.SetValue(nCol3); m_pColEdt3->SetValue(nCol3);
// first initialise the language, then select the // first initialise the language, then select the
if( LANGUAGE_NONE == nLang || LANGUAGE_DONTKNOW == nLang ) if( LANGUAGE_NONE == nLang || LANGUAGE_DONTKNOW == nLang )
nLang = (sal_uInt16)GetAppLanguage(); nLang = (sal_uInt16)GetAppLanguage();
aLangLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_True, sal_False); m_pLangLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_True, sal_False);
aLangLB.SelectLanguage( nLang ); m_pLangLB->SelectLanguage( nLang );
LanguageHdl( 0 ); LanguageHdl( 0 );
aLangLB.SetSelectHdl( LINK( this, SwSortDlg, LanguageHdl )); m_pLangLB->SetSelectHdl( LINK( this, SwSortDlg, LanguageHdl ));
aSortUpRB.Check(bAsc1); m_pSortUp1RB->Check(bAsc1);
aSortDnRB.Check(!bAsc1); m_pSortDn1RB->Check(!bAsc1);
aSortUp2RB.Check(bAsc2); m_pSortUp2RB->Check(bAsc2);
aSortDn2RB.Check(!bAsc2); m_pSortDn2RB->Check(!bAsc2);
aSortUp3RB.Check(bAsc3); m_pSortUp3RB->Check(bAsc3);
aSortDn3RB.Check(!bAsc3); m_pSortDn3RB->Check(!bAsc3);
aCaseCB.Check( bCsSens ); m_pCaseCB->Check( bCsSens );
aDelimTabRB.Check(cDeli == '\t'); m_pDelimTabRB->Check(cDeli == '\t');
if(!aDelimTabRB.IsChecked()) if(!m_pDelimTabRB->IsChecked())
{ {
aDelimEdt.SetText(rtl::OUString(cDeli)); m_pDelimEdt->SetText(rtl::OUString(cDeli));
aDelimFreeRB.Check(sal_True); m_pDelimEdt->Check(sal_True);
DelimHdl(&aDelimFreeRB); DelimHdl(m_pDelimFreeRB);
} }
else else
DelimHdl(&aDelimTabRB); DelimHdl(m_pDelimTabRB);
FreeResource();
if( ::lcl_GetSelTbl( rSh, nX, nY) ) if( ::lcl_GetSelTbl( rSh, nX, nY) )
{ {
sal_uInt16 nMax = aRowRB.IsChecked()? nY : nX; sal_uInt16 nMax = m_pRowRB->IsChecked()? nY : nX;
aColEdt1.SetMax(nMax); m_pColEdt1->SetMax(nMax);
aColEdt2.SetMax(nMax); m_pColEdt2->SetMax(nMax);
aColEdt3.SetMax(nMax); m_pColEdt3->SetMax(nMax);
} }
aDelimEdt.SetAccessibleRelationLabeledBy(&aDelimFreeRB); m_pDelimEdt->SetAccessibleRelationLabeledBy(m_pDelimFreeRB);
aDelimPB.SetAccessibleRelationLabeledBy(&aDelimFreeRB); m_pDelimPB->SetAccessibleRelationLabeledBy(m_pDelimFreeRB);
aDelimPB.SetAccessibleRelationMemberOf(&aDelimFL); m_pDelimPB->SetAccessibleRelationMemberOf(m_pDelimFreeRB);
aColEdt1.SetAccessibleRelationMemberOf(&aKeyCB1); m_pColEdt1->SetAccessibleRelationMemberOf(m_pKeyCB1);
aColEdt1.SetAccessibleRelationLabeledBy(&aColLbl); m_pColEdt1->SetAccessibleRelationLabeledBy(m_pColLbl);
aTypDLB1.SetAccessibleRelationMemberOf(&aKeyCB1); m_pTypDLB1->SetAccessibleRelationMemberOf(m_pKeyCB1);
aTypDLB1.SetAccessibleRelationLabeledBy(&aTypLbl); m_pTypDLB1->SetAccessibleRelationLabeledBy(m_pTypLbl);
aColEdt2.SetAccessibleRelationMemberOf(&aKeyCB2); m_pColEdt2->SetAccessibleRelationMemberOf(m_pKeyCB2);
aColEdt2.SetAccessibleRelationLabeledBy(&aColLbl); m_pColEdt2->SetAccessibleRelationLabeledBy(m_pColLbl);
aTypDLB2.SetAccessibleRelationMemberOf(&aKeyCB2); m_pTypDLB2->SetAccessibleRelationMemberOf(m_pKeyCB2);
aTypDLB2.SetAccessibleRelationLabeledBy(&aTypLbl); m_pTypDLB2->SetAccessibleRelationLabeledBy(m_pTypLbl);
aColEdt3.SetAccessibleRelationMemberOf(&aKeyCB3); m_pColEdt3->SetAccessibleRelationMemberOf(m_pKeyCB3);
aColEdt3.SetAccessibleRelationLabeledBy(&aColLbl); m_pColEdt3->SetAccessibleRelationLabeledBy(m_pColLbl);
aTypDLB3.SetAccessibleRelationMemberOf(&aKeyCB3); m_pTypDLB3->SetAccessibleRelationMemberOf(m_pKeyCB3);
aTypDLB3.SetAccessibleRelationLabeledBy(&aTypLbl); m_pTypDLB3->SetAccessibleRelationLabeledBy(m_pTypLbl);
} }
SwSortDlg::~SwSortDlg() SwSortDlg::~SwSortDlg()
{ {
::lcl_ClearLstBoxAndDelUserData( aTypDLB1 ); ::lcl_ClearLstBoxAndDelUserData(*m_pTypDLB1);
::lcl_ClearLstBoxAndDelUserData( aTypDLB2 ); ::lcl_ClearLstBoxAndDelUserData(*m_pTypDLB2);
::lcl_ClearLstBoxAndDelUserData( aTypDLB3 ); ::lcl_ClearLstBoxAndDelUserData(*m_pTypDLB3);
delete pColRes; delete pColRes;
} }
sal_Unicode SwSortDlg::GetDelimChar() const sal_Unicode SwSortDlg::GetDelimChar() const
{ {
sal_Unicode cRet = '\t'; sal_Unicode cRet = '\t';
if( !aDelimTabRB.IsChecked() ) if( !m_pDelimTabRB->IsChecked() )
{ {
String aTmp( aDelimEdt.GetText() ); String aTmp( m_pDelimEdt->GetText() );
if( aTmp.Len() ) if( aTmp.Len() )
cRet = aTmp.GetChar( 0 ); cRet = aTmp.GetChar( 0 );
} }
...@@ -308,35 +293,35 @@ sal_Unicode SwSortDlg::GetDelimChar() const ...@@ -308,35 +293,35 @@ sal_Unicode SwSortDlg::GetDelimChar() const
void SwSortDlg::Apply() void SwSortDlg::Apply()
{ {
// save all settings // save all settings
bCheck1 = aKeyCB1.IsChecked(); bCheck1 = m_pKeyCB1->IsChecked();
bCheck2 = aKeyCB2.IsChecked(); bCheck2 = m_pKeyCB2->IsChecked();
bCheck3 = aKeyCB3.IsChecked(); bCheck3 = m_pKeyCB3->IsChecked();
nCol1 = (sal_uInt16)aColEdt1.GetValue(); nCol1 = (sal_uInt16)m_pColEdt1->GetValue();
nCol2 = (sal_uInt16)aColEdt2.GetValue(); nCol2 = (sal_uInt16)m_pColEdt2->GetValue();
nCol3 = (sal_uInt16)aColEdt3.GetValue(); nCol3 = (sal_uInt16)m_pColEdt3->GetValue();
nType1 = aTypDLB1.GetSelectEntryPos(); nType1 = m_pTypDLB1->GetSelectEntryPos();
nType2 = aTypDLB2.GetSelectEntryPos(); nType2 = m_pTypDLB2->GetSelectEntryPos();
nType3 = aTypDLB3.GetSelectEntryPos(); nType3 = m_pTypDLB3->GetSelectEntryPos();
bAsc1 = aSortUpRB.IsChecked(); bAsc1 = m_pSortUp1RB->IsChecked();
bAsc2 = aSortUp2RB.IsChecked(); bAsc2 = m_pSortUp2RB->IsChecked();
bAsc3 = aSortUp3RB.IsChecked(); bAsc3 = m_pSortUp3RB->IsChecked();
bCol = aColumnRB.IsChecked(); bCol = m_pColumnRB->IsChecked();
nLang = aLangLB.GetSelectLanguage(); nLang = m_pLangLB->GetSelectLanguage();
cDeli = GetDelimChar(); cDeli = GetDelimChar();
bCsSens = aCaseCB.IsChecked(); bCsSens = m_pCaseCB->IsChecked();
void* pUserData; void* pUserData;
SwSortOptions aOptions; SwSortOptions aOptions;
if( bCheck1 ) if( bCheck1 )
{ {
String sEntry( aTypDLB1.GetSelectEntry() ); String sEntry( m_pTypDLB1->GetSelectEntry() );
if( sEntry == aNumericTxt ) if( sEntry == aNumericTxt )
sEntry.Erase(); sEntry.Erase();
else if( 0 != (pUserData = aTypDLB1.GetEntryData( else if( 0 != (pUserData = m_pTypDLB1->GetEntryData(
aTypDLB1.GetSelectEntryPos())) ) m_pTypDLB1->GetSelectEntryPos())) )
sEntry = *(String*)pUserData; sEntry = *(String*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol1, sEntry, SwSortKey *pKey = new SwSortKey( nCol1, sEntry,
...@@ -346,11 +331,11 @@ void SwSortDlg::Apply() ...@@ -346,11 +331,11 @@ void SwSortDlg::Apply()
if( bCheck2 ) if( bCheck2 )
{ {
String sEntry( aTypDLB2.GetSelectEntry() ); String sEntry( m_pTypDLB2->GetSelectEntry() );
if( sEntry == aNumericTxt ) if( sEntry == aNumericTxt )
sEntry.Erase(); sEntry.Erase();
else if( 0 != (pUserData = aTypDLB2.GetEntryData( else if( 0 != (pUserData = m_pTypDLB2->GetEntryData(
aTypDLB2.GetSelectEntryPos())) ) m_pTypDLB2->GetSelectEntryPos())) )
sEntry = *(String*)pUserData; sEntry = *(String*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol2, sEntry, SwSortKey *pKey = new SwSortKey( nCol2, sEntry,
...@@ -360,11 +345,11 @@ void SwSortDlg::Apply() ...@@ -360,11 +345,11 @@ void SwSortDlg::Apply()
if( bCheck3 ) if( bCheck3 )
{ {
String sEntry( aTypDLB3.GetSelectEntry() ); String sEntry( m_pTypDLB3->GetSelectEntry() );
if( sEntry == aNumericTxt ) if( sEntry == aNumericTxt )
sEntry.Erase(); sEntry.Erase();
else if( 0 != (pUserData = aTypDLB3.GetEntryData( else if( 0 != (pUserData = m_pTypDLB3->GetEntryData(
aTypDLB3.GetSelectEntryPos())) ) m_pTypDLB3->GetSelectEntryPos())) )
sEntry = *(String*)pUserData; sEntry = *(String*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol3, sEntry, SwSortKey *pKey = new SwSortKey( nCol3, sEntry,
...@@ -393,9 +378,9 @@ void SwSortDlg::Apply() ...@@ -393,9 +378,9 @@ void SwSortDlg::Apply()
IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton ) IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton )
{ {
sal_Bool bEnable = pButton == &aDelimFreeRB && aDelimFreeRB.IsEnabled(); sal_Bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled();
aDelimEdt.Enable( bEnable ); m_pDelimEdt->Enable( bEnable );
aDelimPB.Enable( bEnable ); m_pDelimPB->Enable( bEnable );
return 0; return 0;
} }
...@@ -406,13 +391,13 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) ...@@ -406,13 +391,13 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl)
{ {
SfxAllItemSet aSet( rSh.GetAttrPool() ); SfxAllItemSet aSet( rSh.GetAttrPool() );
aSet.Put( SfxInt32Item( SID_ATTR_CHAR, GetDelimChar() ) ); aSet.Put( SfxInt32Item( SID_ATTR_CHAR, GetDelimChar() ) );
SfxAbstractDialog* pMap = pFact->CreateSfxDialog( &aDelimPB, aSet, SfxAbstractDialog* pMap = pFact->CreateSfxDialog( m_pDelimPB, aSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ); rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP );
if( RET_OK == pMap->Execute() ) if( RET_OK == pMap->Execute() )
{ {
SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False );
if ( pItem ) if ( pItem )
aDelimEdt.SetText( rtl::OUString(pItem->GetValue()) ); m_pDelimEdt->SetText( rtl::OUString(pItem->GetValue()) );
} }
delete pMap; delete pMap;
...@@ -422,38 +407,38 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) ...@@ -422,38 +407,38 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl)
IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck ) IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck )
{ {
if( pCheck == ( CheckBox* ) &aRowRB) if( pCheck == ( CheckBox* ) m_pRowRB)
{ {
aColLbl.SetText(aColTxt); m_pColLbl->SetText(aColTxt);
aColEdt1.SetMax(nY); m_pColEdt1->SetMax(nY);
aColEdt2.SetMax(nY); m_pColEdt2->SetMax(nY);
aColEdt3.SetMax(nY); m_pColEdt3->SetMax(nY);
aColEdt1.SetAccessibleName(aColTxt); m_pColEdt1->SetAccessibleName(aColTxt);
aColEdt2.SetAccessibleName(aColTxt); m_pColEdt2->SetAccessibleName(aColTxt);
aColEdt3.SetAccessibleName(aColTxt); m_pColEdt3->SetAccessibleName(aColTxt);
} }
else if( pCheck == ( CheckBox* ) &aColumnRB) else if( pCheck == ( CheckBox* ) m_pColumnRB)
{ {
aColLbl.SetText(aRowTxt); m_pColLbl->SetText(aRowTxt);
aColEdt1.SetMax(nX); m_pColEdt1->SetMax(nX);
aColEdt2.SetMax(nX); m_pColEdt2->SetMax(nX);
aColEdt3.SetMax(nX); m_pColEdt3->SetMax(nX);
aColEdt1.SetAccessibleName(aRowTxt); m_pColEdt1->SetAccessibleName(aRowTxt);
aColEdt2.SetAccessibleName(aRowTxt); m_pColEdt2->SetAccessibleName(aRowTxt);
aColEdt3.SetAccessibleName(aRowTxt); m_pColEdt3->SetAccessibleName(aRowTxt);
} }
else if(!aKeyCB1.IsChecked() && else if(!m_pKeyCB1->IsChecked() &&
!aKeyCB2.IsChecked() && !m_pKeyCB2->IsChecked() &&
!aKeyCB3.IsChecked()) !m_pKeyCB3->IsChecked())
pCheck->Check(sal_True); pCheck->Check(sal_True);
return 0; return 0;
} }
IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
{ {
lang::Locale aLcl( SvxCreateLocale( aLangLB.GetSelectLanguage() ) ); lang::Locale aLcl( SvxCreateLocale( m_pLangLB->GetSelectLanguage() ) );
Sequence < OUString > aSeq( Sequence < OUString > aSeq(
GetAppCollator().listCollatorAlgorithms( aLcl )); GetAppCollator().listCollatorAlgorithms( aLcl ));
...@@ -461,7 +446,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) ...@@ -461,7 +446,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
pColRes = new CollatorResource(); pColRes = new CollatorResource();
const sal_uInt16 nLstBoxCnt = 3; const sal_uInt16 nLstBoxCnt = 3;
ListBox* aLstArr[ nLstBoxCnt ] = { &aTypDLB1, &aTypDLB2, &aTypDLB3 }; ListBox* aLstArr[ nLstBoxCnt ] = { m_pTypDLB1, m_pTypDLB2, m_pTypDLB3 };
sal_uInt16* aTypeArr[ nLstBoxCnt ] = { &nType1, &nType2, &nType3 }; sal_uInt16* aTypeArr[ nLstBoxCnt ] = { &nType1, &nType2, &nType3 };
String aOldStrArr[ nLstBoxCnt ]; String aOldStrArr[ nLstBoxCnt ];
sal_uInt16 n; sal_uInt16 n;
......
sw/source/ui/misc/srtdlg.src
Dosyayı görüntüle @ ce8b87b0
...@@ -26,324 +26,9 @@ ...@@ -26,324 +26,9 @@
************************************************************************/ ************************************************************************/
#include "misc.hrc" #include "misc.hrc"
#include "srtdlg.hrc"
#include "cmdid.h" #include "cmdid.h"
#include "helpid.h" #include "helpid.h"
ModalDialog DLG_SORTING
{
HelpID = CMD_FN_SORTING_DLG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 268 , 193 ) ;
Text [ en-US ] = "Sort" ;
Moveable = TRUE ;
OKButton BT_OK
{
Pos = MAP_APPFONT ( 212 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL
{
Pos = MAP_APPFONT ( 212 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BT_HELP
{
Pos = MAP_APPFONT ( 212 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
FixedText FT_COL
{
Pos = MAP_APPFONT ( 68 , 12 ) ;
Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "Column" ;
Left = TRUE ;
};
FixedText FT_KEYTYP
{
Pos = MAP_APPFONT ( 101, 12 ) ;
Size = MAP_APPFONT ( 48 , 8 ) ;
Text [ en-US ] = "Key type" ;
Left = TRUE ;
};
FixedText FT_DIR
{
Pos = MAP_APPFONT ( 155 , 12 ) ;
Size = MAP_APPFONT ( 49 , 10 ) ;
Text [ en-US ] = "Order" ;
};
CheckBox CB_KEY1
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY1";
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~1" ;
Check = TRUE ;
};
NumericField ED_KEY1
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY1";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 23 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
Text = "10" ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
String STR_NUMERIC
{
Text [ en-US ] = "Numeric";
};
ListBox DLB_KEY1
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY1";
Pos = MAP_APPFONT ( 96 , 23 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP";
Pos = MAP_APPFONT ( 155 , 23 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "~Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN";
Pos = MAP_APPFONT ( 155 , 35 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "~Descending" ;
TabStop = TRUE ;
};
CheckBox CB_KEY2
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY2";
Pos = MAP_APPFONT ( 12 , 52 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~2" ;
};
NumericField ED_KEY2
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY2";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 50 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
ListBox DLB_KEY2
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY2";
Pos = MAP_APPFONT ( 96 , 50 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP2
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP2";
Pos = MAP_APPFONT ( 155 , 50 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN2
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN2";
Pos = MAP_APPFONT ( 155 , 62 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Descending" ;
TabStop = TRUE ;
};
CheckBox CB_KEY3
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY3";
Pos = MAP_APPFONT ( 12 , 81 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~3" ;
};
NumericField ED_KEY3
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY3";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 79 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
ListBox DLB_KEY3
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY3";
Pos = MAP_APPFONT ( 96 , 79 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP3
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP3";
Pos = MAP_APPFONT ( 155 , 79 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN3
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN3";
Pos = MAP_APPFONT ( 155 , 91 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Descending" ;
TabStop = TRUE ;
};
FixedLine FL_SORT_2
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 200 , 8 ) ;
Text [ en-US ] = "Sort criteria" ;
};
RadioButton RB_COL
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_COL";
Pos = MAP_APPFONT ( 12 , 120 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Text [ en-US ] = "Col~umns" ;
TabStop = TRUE ;
};
RadioButton RB_ROW
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_ROW";
Pos = MAP_APPFONT ( 12 , 133 ) ;
Size = MAP_APPFONT ( 34 , 10 ) ;
Text [ en-US ] = "~Rows" ;
TabStop = TRUE ;
Check = TRUE ;
};
FixedLine FL_DIR
{
Pos = MAP_APPFONT ( 6 , 108 ) ;
Size = MAP_APPFONT ( 95 , 8 ) ;
Text [ en-US ] = "Direction" ;
};
RadioButton RB_TAB
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_TAB";
Pos = MAP_APPFONT ( 113 , 120 ) ;
Size = MAP_APPFONT ( 44 , 9 ) ;
Text [ en-US ] = "~Tabs" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_TABCH
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_TABCH";
Pos = MAP_APPFONT ( 113 , 133 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Text [ en-US ] = "~Character" ;
TabStop = TRUE ;
};
Edit ED_TABCH
{
HelpID = "sw:Edit:DLG_SORTING:ED_TABCH";
Border = TRUE ;
Pos = MAP_APPFONT ( 180 , 133 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
FixedLine FL_DELIM
{
Pos = MAP_APPFONT ( 107 , 108 ) ;
Size = MAP_APPFONT ( 99 , 8 ) ;
Text [ en-US ] = "Separator" ;
};
String STR_ROW
{
Text [ en-US ] = "Rows" ;
};
String STR_COL
{
Text [ en-US ] = "Column" ;
};
PushButton PB_DELIM
{
HelpID = "sw:PushButton:DLG_SORTING:PB_DELIM";
Pos = MAP_APPFONT ( 195 , 133 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
Text = "...";
};
FixedLine FL_LANG
{
Pos = MAP_APPFONT ( 6 , 147 ) ;
Size = MAP_APPFONT ( 95 , 8 ) ;
Text [ en-US ] = "Language";
};
ListBox LB_LANG
{
HelpID = "sw:ListBox:DLG_SORTING:LB_LANG";
Pos = MAP_APPFONT ( 12 , 158 ) ;
Size = MAP_APPFONT ( 83 , 61 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Sort = TRUE ;
};
FixedLine FL_SORT
{
Pos = MAP_APPFONT ( 107 , 147 ) ;
Size = MAP_APPFONT ( 99 , 8 ) ;
Text [ en-US ] = "Setting";
};
CheckBox CB_CASE
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_CASE";
Pos = MAP_APPFONT ( 113 , 159 ) ;
Size = MAP_APPFONT ( 147 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Match case";
};
};
InfoBox MSG_SRTERR InfoBox MSG_SRTERR
{ {
BUTTONS = WB_OK ; BUTTONS = WB_OK ;
......
sw/source/ui/misc/titlepage.cxx
Dosyayı görüntüle @ ce8b87b0
...@@ -148,8 +148,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const ...@@ -148,8 +148,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const
} }
SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) : SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
SfxModalDialog( pParent, rtl::OString("DLG_TITLEPAGE"), SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("modules/swriter/ui/titlepage.ui")) ),
mpPageFmtDesc(0) mpPageFmtDesc(0)
{ {
get(m_pUseExistingPagesRB, "RB_USE_EXISTING_PAGES"); get(m_pUseExistingPagesRB, "RB_USE_EXISTING_PAGES");
......
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