sw/UIConfig_swriter.mk | 1
sw/source/ui/dialog/regionsw.hrc | 22
sw/source/ui/dialog/regionsw.src | 205 --------
sw/source/ui/dialog/uiregionsw.cxx | 180 +++----
sw/source/ui/inc/regionsw.hxx | 52 +-
sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui | 515 +++++++++++++++++++++
6 files changed, 630 insertions(+), 345 deletions(-)
New commits:
commit fd628da9e34d7fb25e2ab7606d80509c3e651a1b
Author: Csikós Tamás <csks.t...@gmail.com>
Date: Wed Jul 31 17:18:57 2013 +0200
modern .ui widgetlayout for uiregionsw
widget found at: writer/insert/section -> footnotes/endnotes
Conflicts:
sw/source/ui/dialog/regionsw.src
Change-Id: Ie3f24eeb63f334dd8db9fce4bc2762b1927e58f9
Reviewed-on: https://gerrit.libreoffice.org/5221
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 0e3f9ee..d259830 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footendnotedialog \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
+ sw/uiconfig/swriter/ui/footnotesendnotestabpage \
sw/uiconfig/swriter/ui/frmaddpage \
sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/indexentry \
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc
index 620382a..8d79cbe 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/ui/dialog/regionsw.hrc
@@ -24,38 +24,18 @@
#define CB_DDE 1
#define CB_DISMISS 2
-#define CB_END_AT_TXTEND 3
-#define CB_END_NUM 4
#define CB_FILE 5
-#define CB_FTN_AT_TXTEND 6
-#define CB_FTN_NUM 7
#define CB_HIDE 8
#define CB_PASSWD 9
#define CB_PROTECT 10
-#define CB_FTN_NUM_FMT 11
-#define CB_END_NUM_FMT 12
#define ED_CONDITION 13
-#define ED_END_PREFIX 14
-#define ED_END_SUFFIX 15
#define ED_FILE 16
-#define ED_FTN_PREFIX 17
-#define ED_FTN_SUFFIX 18
#define ED_RANAME 19
#define ED_RNAME 20
#define FT_CONDITION 21
-#define FLD_END_OFFSET 23
-#define FLD_FTN_OFFSET 24
#define FT_DDE 25
-#define FT_END_OFFSET 26
-#define FT_END_PREFIX 27
-#define FT_END_SUFFIX 28
#define FT_FILE 29
-#define FT_FTN_OFFSET 30
-#define FT_FTN_PREFIX 31
-#define FT_FTN_SUFFIX 32
#define FT_SUBREG 34
-#define LB_END_NUMVIEW 36
-#define LB_FTN_NUMVIEW 37
#define LB_SUBREG 38
#define PB_CANCEL 39
#define PB_FILE 40
@@ -69,8 +49,6 @@
#define FL_PROTECT 49
#define FL_HIDE 50
#define PB_PASSWD 51
-#define FL_END 52
-#define FL_FTN 53
#define IL_BITMAPS 54
// #114856# edit in readonly sections
#define FL_PROPERTIES 56
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index ec820ad..a652597 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -380,209 +380,4 @@ TabDialog DLG_SECTION_PROPERTIES
Text [ en-US ] = "Options";
};
-
-TabPage TP_SECTION_FTNENDNOTES
-{
- HelpID = HID_SECTION_FTNENDNOTES_PAGE;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_FTN
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Footnotes";
- };
- CheckBox CB_FTN_AT_TXTEND
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Collec~t at end of text";
-
- };
- CheckBox CB_FTN_NUM
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM";
- Pos = MAP_APPFONT ( 18 , 29 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Restart numbering";
- };
- FixedText FT_FTN_OFFSET
- {
- Pos = MAP_APPFONT ( 24 , 46 ) ;
- Size = MAP_APPFONT ( 64 , 8 ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Start at" ;
- };
- NumericField FLD_FTN_OFFSET
- {
- HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET";
- Pos = MAP_APPFONT ( 90 , 44 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- Spin = TRUE ;
- Minimum = 1 ;
- First = 1 ;
- Last = 9999 ;
- Maximum = 9999 ;
- TabStop = TRUE ;
- Border = TRUE ;
- };
- CheckBox CB_FTN_NUM_FMT
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT";
- Pos = MAP_APPFONT ( 24 , 61 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Custom ~format";
- };
- FixedText FT_FTN_PREFIX
- {
- Pos = MAP_APPFONT ( 30 , 76 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
- Text [ en-US ] = "Be~fore" ;
- Left = TRUE ;
- };
- Edit ED_FTN_PREFIX
- {
- HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 74 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
- ListBox LB_FTN_NUMVIEW
- {
- HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 123 , 74 ) ;
- Size = MAP_APPFONT ( 62 , 50 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_FTN_SUFFIX
- {
- Pos = MAP_APPFONT ( 191 , 76 ) ;
- Size = MAP_APPFONT ( 25 , 8 ) ;
- Text [ en-US ] = "Aft~er" ;
- Right = TRUE ;
- };
- Edit ED_FTN_SUFFIX
- {
- HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 219 , 74 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
-
-
- FixedLine FL_END
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 6 , 92 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Endnotes";
- };
- CheckBox CB_END_AT_TXTEND
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND";
- Pos = MAP_APPFONT ( 12 , 103 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "C~ollect at end of section";
- };
- CheckBox CB_END_NUM
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM";
- Pos = MAP_APPFONT ( 16 , 118 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Restart numbering";
- };
- FixedText FT_END_OFFSET
- {
- Pos = MAP_APPFONT ( 24 , 135 ) ;
- Size = MAP_APPFONT ( 64 , 8 ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Start at" ;
- };
- NumericField FLD_END_OFFSET
- {
- HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET";
- Pos = MAP_APPFONT ( 90 , 133 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- Spin = TRUE ;
- Minimum = 1 ;
- First = 1 ;
- Last = 9999 ;
- Maximum = 9999 ;
- TabStop = TRUE ;
- Border = TRUE ;
- };
- CheckBox CB_END_NUM_FMT
- {
- HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT";
- Pos = MAP_APPFONT ( 24 , 150 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Custom format";
- };
-
- FixedText FT_END_PREFIX
- {
- Pos = MAP_APPFONT ( 30 , 165 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
- Text [ en-US ] = "Be~fore" ;
- Left = TRUE ;
- };
- Edit ED_END_PREFIX
- {
- HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 90 , 163 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
- ListBox LB_END_NUMVIEW
- {
- HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 123 , 163 ) ;
- Size = MAP_APPFONT ( 62 , 50 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- };
- FixedText FT_END_SUFFIX
- {
- Pos = MAP_APPFONT ( 191 , 165 ) ;
- Size = MAP_APPFONT ( 25 , 8 ) ;
- Text [ en-US ] = "Aft~er" ;
- Right = TRUE ;
- };
- Edit ED_END_SUFFIX
- {
- HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 219 , 163 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- MaxTextLength = 50 ;
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 734f936..918dbff 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1868,44 +1868,42 @@ inline SvxExtNumType GetNumType( sal_uInt16 n )
SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
const SfxItemSet &rAttrSet)
- : SfxTabPage( pParent, SW_RES( TP_SECTION_FTNENDNOTES ), rAttrSet ),
- aFtnFL ( this, SW_RES( FL_FTN ) ),
- aFtnNtAtTextEndCB ( this, SW_RES( CB_FTN_AT_TXTEND ) ),
-
- aFtnNtNumCB ( this, SW_RES( CB_FTN_NUM ) ),
- aFtnOffsetLbl ( this, SW_RES( FT_FTN_OFFSET )),
- aFtnOffsetFld ( this, SW_RES( FLD_FTN_OFFSET )),
-
- aFtnNtNumFmtCB ( this, SW_RES( CB_FTN_NUM_FMT ) ),
- aFtnPrefixFT ( this, SW_RES( FT_FTN_PREFIX )),
- aFtnPrefixED ( this, SW_RES( ED_FTN_PREFIX )),
- aFtnNumViewBox ( this, SW_RES( LB_FTN_NUMVIEW ),
INSERT_NUM_EXTENDED_TYPES),
- aFtnSuffixFT ( this, SW_RES( FT_FTN_SUFFIX )),
- aFtnSuffixED ( this, SW_RES( ED_FTN_SUFFIX )),
-
- aEndFL ( this, SW_RES( FL_END ) ),
- aEndNtAtTextEndCB ( this, SW_RES( CB_END_AT_TXTEND )),
-
- aEndNtNumCB ( this, SW_RES( CB_END_NUM )),
- aEndOffsetLbl ( this, SW_RES( FT_END_OFFSET )),
- aEndOffsetFld ( this, SW_RES( FLD_END_OFFSET )),
-
- aEndNtNumFmtCB ( this, SW_RES( CB_END_NUM_FMT ) ),
- aEndPrefixFT ( this, SW_RES( FT_END_PREFIX )),
- aEndPrefixED ( this, SW_RES( ED_END_PREFIX )),
- aEndNumViewBox ( this, SW_RES( LB_END_NUMVIEW ),
INSERT_NUM_EXTENDED_TYPES),
- aEndSuffixFT ( this, SW_RES( FT_END_SUFFIX )),
- aEndSuffixED ( this, SW_RES( ED_END_SUFFIX ))
+ : SfxTabPage( pParent, "FootnotesEndnotesTabPage",
"modules/swriter/ui/footnotesendnotestabpage.ui", rAttrSet )
+
{
- FreeResource();
+ get(pFtnNtAtTextEndCB,"ftnntattextend");
+
+ get(pFtnNtNumCB,"ftnntnum");
+ get(pFtnOffsetLbl,"ftnoffset_label");
+ get(pFtnOffsetFld,"ftnoffset");
+
+ get(pFtnNtNumFmtCB,"ftnntnumfmt");
+ get(pFtnPrefixFT,"ftnprefix_label");
+ get(pFtnPrefixED,"ftnprefix");
+ get(pFtnNumViewBox,"ftnnumviewbox");
+ get(pFtnSuffixFT,"ftnsuffix_label");
+ get(pFtnSuffixED,"ftnsuffix");
+
+ get(pEndNtAtTextEndCB,"endntattextend");
+
+ get(pEndNtNumCB,"endntnum");
+ get(pEndOffsetLbl,"endoffset_label");
+ get(pEndOffsetFld,"endoffset");
+
+ get(pEndNtNumFmtCB,"endntnumfmt");
+ get(pEndPrefixFT,"endprefix_label");
+ get(pEndPrefixED,"endprefix");
+ get(pEndNumViewBox,"endnumviewbox");
+ get(pEndSuffixFT,"endsuffix_label");
+ get(pEndSuffixED,"endsuffix");
Link aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl));
- aFtnNtAtTextEndCB.SetClickHdl( aLk );
- aFtnNtNumCB.SetClickHdl( aLk );
- aEndNtAtTextEndCB.SetClickHdl( aLk );
- aEndNtNumCB.SetClickHdl( aLk );
- aFtnNtNumFmtCB.SetClickHdl( aLk );
- aEndNtNumFmtCB.SetClickHdl( aLk );
+ pFtnNtAtTextEndCB->SetClickHdl( aLk );
+ pFtnNtNumCB->SetClickHdl( aLk );
+ pEndNtAtTextEndCB->SetClickHdl( aLk );
+ pEndNtNumCB->SetClickHdl( aLk );
+ pFtnNtNumFmtCB->SetClickHdl( aLk );
+ pEndNtNumFmtCB->SetClickHdl( aLk );
}
SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
@@ -1914,9 +1912,9 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
{
- SwFmtFtnAtTxtEnd aFtn( aFtnNtAtTextEndCB.IsChecked()
- ? ( aFtnNtNumCB.IsChecked()
- ? ( aFtnNtNumFmtCB.IsChecked()
+ SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked()
+ ? ( pFtnNtNumCB->IsChecked()
+ ? ( pFtnNtNumFmtCB->IsChecked()
? FTNEND_ATTXTEND_OWNNUMANDFMT
: FTNEND_ATTXTEND_OWNNUMSEQ )
: FTNEND_ATTXTEND )
@@ -1925,19 +1923,19 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet(
SfxItemSet& rSet )
switch( aFtn.GetValue() )
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
- aFtn.SetNumType( aFtnNumViewBox.GetSelectedNumberingType() );
- aFtn.SetPrefix( aFtnPrefixED.GetText().replaceAll("\\t", "\t") ); //
fdo#65666
- aFtn.SetSuffix( aFtnSuffixED.GetText().replaceAll("\\t", "\t") );
+ aFtn.SetNumType( pFtnNumViewBox->GetSelectedNumberingType() );
+ aFtn.SetPrefix( pFtnPrefixED->GetText().replaceAll("\\t", "\t") ); //
fdo#65666
+ aFtn.SetSuffix( pFtnSuffixED->GetText().replaceAll("\\t", "\t") );
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aFtn.SetOffset( static_cast< sal_uInt16 >( aFtnOffsetFld.GetValue()-1
) );
+ aFtn.SetOffset( static_cast< sal_uInt16 >( pFtnOffsetFld->GetValue()-1
) );
// no break;
}
- SwFmtEndAtTxtEnd aEnd( aEndNtAtTextEndCB.IsChecked()
- ? ( aEndNtNumCB.IsChecked()
- ? ( aEndNtNumFmtCB.IsChecked()
+ SwFmtEndAtTxtEnd aEnd( pEndNtAtTextEndCB->IsChecked()
+ ? ( pEndNtNumCB->IsChecked()
+ ? ( pEndNtNumFmtCB->IsChecked()
? FTNEND_ATTXTEND_OWNNUMANDFMT
: FTNEND_ATTXTEND_OWNNUMSEQ )
: FTNEND_ATTXTEND )
@@ -1946,13 +1944,13 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet(
SfxItemSet& rSet )
switch( aEnd.GetValue() )
{
case FTNEND_ATTXTEND_OWNNUMANDFMT:
- aEnd.SetNumType( aEndNumViewBox.GetSelectedNumberingType() );
- aEnd.SetPrefix( aEndPrefixED.GetText().replaceAll("\\t", "\t") );
- aEnd.SetSuffix( aEndSuffixED.GetText().replaceAll("\\t", "\t") );
+ aEnd.SetNumType( pEndNumViewBox->GetSelectedNumberingType() );
+ aEnd.SetPrefix( pEndPrefixED->GetText().replaceAll("\\t", "\t") );
+ aEnd.SetSuffix( pEndSuffixED->GetText().replaceAll("\\t", "\t") );
// no break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- aEnd.SetOffset( static_cast< sal_uInt16 >( aEndOffsetFld.GetValue()-1
) );
+ aEnd.SetOffset( static_cast< sal_uInt16 >( pEndOffsetFld->GetValue()-1
) );
// no break;
}
@@ -1974,29 +1972,29 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
if( bFtn )
{
- pNtAtTextEndCB = &aFtnNtAtTextEndCB;
- pNtNumCB = &aFtnNtNumCB;
- pNtNumFmtCB = &aFtnNtNumFmtCB;
- pPrefixFT = &aFtnPrefixFT;
- pPrefixED = &aFtnPrefixED;
- pSuffixFT = &aFtnSuffixFT;
- pSuffixED = &aFtnSuffixED;
- pNumViewBox = &aFtnNumViewBox;
- pOffsetTxt = &aFtnOffsetLbl;
- pOffsetFld = &aFtnOffsetFld;
+ pNtAtTextEndCB = pFtnNtAtTextEndCB;
+ pNtNumCB = pFtnNtNumCB;
+ pNtNumFmtCB = pFtnNtNumFmtCB;
+ pPrefixFT = pFtnPrefixFT;
+ pPrefixED = pFtnPrefixED;
+ pSuffixFT = pFtnSuffixFT;
+ pSuffixED = pFtnSuffixED;
+ pNumViewBox = pFtnNumViewBox;
+ pOffsetTxt = pFtnOffsetLbl;
+ pOffsetFld = pFtnOffsetFld;
}
else
{
- pNtAtTextEndCB = &aEndNtAtTextEndCB;
- pNtNumCB = &aEndNtNumCB;
- pNtNumFmtCB = &aEndNtNumFmtCB;
- pPrefixFT = &aEndPrefixFT;
- pPrefixED = &aEndPrefixED;
- pSuffixFT = &aEndSuffixFT;
- pSuffixED = &aEndSuffixED;
- pNumViewBox = &aEndNumViewBox;
- pOffsetTxt = &aEndOffsetLbl;
- pOffsetFld = &aEndOffsetFld;
+ pNtAtTextEndCB = pEndNtAtTextEndCB;
+ pNtNumCB = pEndNtNumCB;
+ pNtNumFmtCB = pEndNtNumFmtCB;
+ pPrefixFT = pEndPrefixFT;
+ pPrefixED = pEndPrefixED;
+ pSuffixFT = pEndSuffixFT;
+ pSuffixED = pEndSuffixED;
+ pNumViewBox = pEndNumViewBox;
+ pOffsetTxt = pEndOffsetLbl;
+ pOffsetFld = pEndOffsetFld;
}
sal_uInt16 eState = rAttr.GetValue();
@@ -2058,8 +2056,8 @@ SfxTabPage* SwSectionFtnEndTabPage::Create( Window*
pParent,
IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
{
- sal_Bool bFoot = &aFtnNtAtTextEndCB == pBox || &aFtnNtNumCB == pBox ||
- &aFtnNtNumFmtCB == pBox ;
+ sal_Bool bFoot = pFtnNtAtTextEndCB == pBox || pFtnNtNumCB == pBox ||
+ pFtnNtNumFmtCB == pBox ;
CheckBox *pNumBox, *pNumFmtBox, *pEndBox;
SwNumberingTypeListBox* pNumViewBox;
@@ -2070,29 +2068,29 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox
*, pBox )
if( bFoot )
{
- pEndBox = &aFtnNtAtTextEndCB;
- pNumBox = &aFtnNtNumCB;
- pNumFmtBox = &aFtnNtNumFmtCB;
- pNumViewBox = &aFtnNumViewBox;
- pOffsetTxt = &aFtnOffsetLbl;
- pOffsetFld = &aFtnOffsetFld;
- pPrefixFT = &aFtnPrefixFT;
- pSuffixFT = &aFtnSuffixFT;
- pPrefixED = &aFtnPrefixED;
- pSuffixED = &aFtnSuffixED;
+ pEndBox = pFtnNtAtTextEndCB;
+ pNumBox = pFtnNtNumCB;
+ pNumFmtBox = pFtnNtNumFmtCB;
+ pNumViewBox = pFtnNumViewBox;
+ pOffsetTxt = pFtnOffsetLbl;
+ pOffsetFld = pFtnOffsetFld;
+ pPrefixFT = pFtnPrefixFT;
+ pSuffixFT = pFtnSuffixFT;
+ pPrefixED = pFtnPrefixED;
+ pSuffixED = pFtnSuffixED;
}
else
{
- pEndBox = &aEndNtAtTextEndCB;
- pNumBox = &aEndNtNumCB;
- pNumFmtBox = &aEndNtNumFmtCB;
- pNumViewBox = &aEndNumViewBox;
- pOffsetTxt = &aEndOffsetLbl;
- pOffsetFld = &aEndOffsetFld;
- pPrefixFT = &aEndPrefixFT;
- pSuffixFT = &aEndSuffixFT;
- pPrefixED = &aEndPrefixED;
- pSuffixED = &aEndSuffixED;
+ pEndBox = pEndNtAtTextEndCB;
+ pNumBox = pEndNtNumCB;
+ pNumFmtBox = pEndNtNumFmtCB;
+ pNumViewBox = pEndNumViewBox;
+ pOffsetTxt = pEndOffsetLbl;
+ pOffsetFld = pEndOffsetFld;
+ pPrefixFT = pEndPrefixFT;
+ pSuffixFT = pEndSuffixFT;
+ pPrefixED = pEndPrefixED;
+ pSuffixED = pEndSuffixED;
}
sal_Bool bEnableAtEnd = STATE_CHECK == pEndBox->GetState();
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 75bebb6..1cb9509 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -207,33 +207,31 @@ public:
class SwSectionFtnEndTabPage : public SfxTabPage
{
- FixedLine aFtnFL;
- CheckBox aFtnNtAtTextEndCB;
-
- CheckBox aFtnNtNumCB;
- FixedText aFtnOffsetLbl;
- NumericField aFtnOffsetFld;
-
- CheckBox aFtnNtNumFmtCB;
- FixedText aFtnPrefixFT;
- Edit aFtnPrefixED;
- SwNumberingTypeListBox aFtnNumViewBox;
- FixedText aFtnSuffixFT;
- Edit aFtnSuffixED;
-
- FixedLine aEndFL;
- CheckBox aEndNtAtTextEndCB;
-
- CheckBox aEndNtNumCB;
- FixedText aEndOffsetLbl;
- NumericField aEndOffsetFld;
-
- CheckBox aEndNtNumFmtCB;
- FixedText aEndPrefixFT;
- Edit aEndPrefixED;
- SwNumberingTypeListBox aEndNumViewBox;
- FixedText aEndSuffixFT;
- Edit aEndSuffixED;
+ CheckBox* pFtnNtAtTextEndCB;
+
+ CheckBox* pFtnNtNumCB;
+ FixedText* pFtnOffsetLbl;
+ NumericField* pFtnOffsetFld;
+
+ CheckBox* pFtnNtNumFmtCB;
+ FixedText* pFtnPrefixFT;
+ Edit* pFtnPrefixED;
+ SwNumberingTypeListBox* pFtnNumViewBox;
+ FixedText* pFtnSuffixFT;
+ Edit* pFtnSuffixED;
+
+ CheckBox* pEndNtAtTextEndCB;
+
+ CheckBox* pEndNtNumCB;
+ FixedText* pEndOffsetLbl;
+ NumericField* pEndOffsetFld;
+
+ CheckBox* pEndNtNumFmtCB;
+ FixedText* pEndPrefixFT;
+ Edit* pEndPrefixED;
+ SwNumberingTypeListBox* pEndNumViewBox;
+ FixedText* pEndSuffixFT;
+ Edit* pEndSuffixED;
DECL_LINK( FootEndHdl, CheckBox * );
diff --git a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
new file mode 100644
index 0000000..98bedc6
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="FootnotesEndnotesTabPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</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">6</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="ftnntnum">
+ <property name="label" translatable="yes">_Restart
numbering</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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="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_spacing">12</property>
+ <child>
+ <object class="GtkSpinButton" id="ftnoffset">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">adjustment1</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="ftnoffset_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Start
at:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">ftnoffset</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>
+ </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="GtkCheckButton" id="ftnntnumfmt">
+ <property name="label" translatable="yes">Custom
_format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="ftnsuffix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="width_chars">6</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ftnsuffix_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Aft_er:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">ftnsuffix</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="swlo-SwNumberingTypeListBox"
id="ftnnumviewbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="type">16</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ftnprefix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="width_chars">6</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="ftnprefix_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">24</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Be_fore:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">ftnprefix</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</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="GtkCheckButton" id="ftnntattextend">
+ <property name="label" translatable="yes">Collec_t at end
of text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Footnotes</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <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">6</property>
+ <child>
+ <object class="GtkCheckButton" id="endntattextend">
+ <property name="label" translatable="yes">C_ollect at end
of section</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="endntnum">
+ <property name="label" translatable="yes">_Restart
numbering</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkSpinButton" id="endoffset">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">adjustment1</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="endoffset_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Start
at:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">endoffset</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>
+ </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="GtkCheckButton" id="endntnumfmt">
+ <property name="label" translatable="yes">_Custom
format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="endsuffix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="width_chars">6</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="endsuffix_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Aft_er:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">endsuffix</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="swlo-SwNumberingTypeListBox"
id="endnumviewbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="type">16</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="endprefix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="width_chars">6</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="endprefix_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">24</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Be_fore:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">endprefix</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Endnotes</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
