[Libreoffice-commits] .: sw/inc sw/source sw/uiconfig sw/UI_sw.mk sw/UI_swriter.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 05:11:53 PST 2012
sw/UI_sw.mk | 1
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/inc/num.hxx | 52 +-
sw/source/ui/inc/numprevw.hxx | 17
sw/source/ui/misc/num.cxx | 372 +++++++++----------
sw/source/ui/misc/num.hrc | 29 -
sw/source/ui/misc/num.src | 260 -------------
sw/source/ui/misc/outline.cxx | 5
sw/uiconfig/sw/ui/20872.ui | 452 -----------------------
sw/uiconfig/swriter/ui/numberingpositionpage.ui | 454 ++++++++++++++++++++++++
11 files changed, 687 insertions(+), 957 deletions(-)
New commits:
commit b4d5ababc26b57d0d8688ed671825acd2c4cfc05
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 12:01:18 2012 +0000
convert outline numbering position tab over fully
Change-Id: I49e9d40d942dd7a23bebaa4783b0ff59e06890b0
diff --git a/sw/UI_sw.mk b/sw/UI_sw.mk
index 96e8a2a..a0f2a36 100644
--- a/sw/UI_sw.mk
+++ b/sw/UI_sw.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_UI_UI,sw))
$(eval $(call gb_UI_add_uifiles,sw,\
- sw/uiconfig/sw/ui/20872 \
sw/uiconfig/sw/ui/20876 \
))
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 890ae28..219ff57 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
+ sw/uiconfig/swriter/ui/numberingpositionpage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5f8d56c..38162ad 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -187,7 +187,6 @@
#define HID_FLD_FUNC "SW_HID_FLD_FUNC"
#define HID_FLD_REF "SW_HID_FLD_REF"
#define HID_OPTSHDWCRSR "SW_HID_OPTSHDWCRSR"
-#define HID_NUM_POSITION "SW_HID_NUM_POSITION"
#define HID_NUMPARA "SW_HID_NUMPARA"
#define HID_REDLINE_OPT "SW_HID_REDLINE_OPT"
#define HID_REDLINE_ACCEPT "SW_HID_REDLINE_ACCEPT"
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 4bbdc11..4a934fa 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -24,6 +24,7 @@
#include <vcl/menubtn.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
@@ -50,38 +51,37 @@ struct SwBmpItemInfo
class SwNumPositionTabPage : public SfxTabPage
{
- FixedLine aLevelFL;
- MultiListBox aLevelLB;
+ ListBox* m_pLevelLB;
+ VclFrame* m_pPositionFrame;
// former set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
- FixedLine aPositionFL;
- FixedText aDistBorderFT;
- MetricField aDistBorderMF;
- CheckBox aRelativeCB;
- FixedText aIndentFT;
- MetricField aIndentMF;
- FixedText aDistNumFT;
- MetricField aDistNumMF;
- FixedText aAlignFT;
- ListBox aAlignLB;
+ FixedText* m_pDistBorderFT;
+ MetricField* m_pDistBorderMF;
+ CheckBox* m_pRelativeCB;
+ FixedText* m_pIndentFT;
+ MetricField* m_pIndentMF;
+ FixedText* m_pDistNumFT;
+ MetricField* m_pDistNumMF;
+ FixedText* m_pAlignFT;
+ ListBox* m_pAlignLB;
// new set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
- FixedText aLabelFollowedByFT;
- ListBox aLabelFollowedByLB;
- FixedText aListtabFT;
- MetricField aListtabMF;
- FixedText aAlign2FT;
- ListBox aAlign2LB;
- FixedText aAlignedAtFT;
- MetricField aAlignedAtMF;
- FixedText aIndentAtFT;
- MetricField aIndentAtMF;
-
- PushButton aStandardPB;
-
- NumberingPreview aPreviewWIN;
+ FixedText* m_pLabelFollowedByFT;
+ ListBox* m_pLabelFollowedByLB;
+ FixedText* m_pListtabFT;
+ MetricField* m_pListtabMF;
+ FixedText* m_pAlign2FT;
+ ListBox* m_pAlign2LB;
+ FixedText* m_pAlignedAtFT;
+ MetricField* m_pAlignedAtMF;
+ FixedText* m_pIndentAtFT;
+ MetricField* m_pIndentAtMF;
+
+ PushButton* m_pStandardPB;
+
+ NumberingPreview* m_pPreviewWIN;
SwNumRule* pActNum;
SwNumRule* pSaveNum;
diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx
index e3d39a1..605c995 100644
--- a/sw/source/ui/inc/numprevw.hxx
+++ b/sw/source/ui/inc/numprevw.hxx
@@ -38,9 +38,20 @@ class NumberingPreview : public Window
virtual void Paint( const Rectangle& rRect );
public:
- NumberingPreview(Window* pParent, const ResId& rResId ) :
- Window(pParent, rResId),
- pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX) {}
+ NumberingPreview(Window* pParent, const ResId& rResId)
+ : Window(pParent, rResId),
+ pActNum(0),nPageWidth(0), pOutlineNames(0),
+ bPosition(sal_False), nActLevel(USHRT_MAX)
+ {
+ }
+
+ NumberingPreview(Window* pParent)
+ : Window(pParent)
+ , pActNum(0),nPageWidth(0), pOutlineNames(0),
+ bPosition(sal_False), nActLevel(USHRT_MAX)
+ {
+ }
+
~NumberingPreview();
void SetNumRule(const SwNumRule* pNum)
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index c3c61dc..f22dc72 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -58,103 +58,103 @@
static sal_Bool bLastRelative = sal_False;
SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
- const SfxItemSet& rSet) :
- SfxTabPage( pParent, SW_RES( TP_NUM_POSITION ), rSet ),
- aLevelFL( this, SW_RES(FL_LEVEL )),
- aLevelLB( this, SW_RES(LB_LEVEL )),
- aPositionFL( this, SW_RES(FL_POSITION )),
-
- aDistBorderFT( this, SW_RES(FT_BORDERDIST )),
- aDistBorderMF( this, SW_RES(MF_BORDERDIST )),
- aRelativeCB( this, SW_RES(CB_RELATIVE )),
- aIndentFT( this, SW_RES(FT_INDENT )),
- aIndentMF( this, SW_RES(MF_INDENT )),
- aDistNumFT( this, SW_RES(FT_NUMDIST )),
- aDistNumMF( this, SW_RES(MF_NUMDIST )),
- aAlignFT( this, SW_RES(FT_ALIGN )),
- aAlignLB( this, SW_RES(LB_ALIGN )),
- aLabelFollowedByFT( this, SW_RES(FT_LABEL_FOLLOWED_BY) ),
- aLabelFollowedByLB( this, SW_RES(LB_LABEL_FOLLOWED_BY) ),
- aListtabFT( this, SW_RES(FT_LISTTAB) ),
- aListtabMF( this, SW_RES(MF_LISTTAB) ),
- aAlign2FT( this, SW_RES(FT_ALIGN_2) ),
- aAlign2LB( this, SW_RES(LB_ALIGN_2) ),
- aAlignedAtFT( this, SW_RES(FT_ALIGNED_AT) ),
- aAlignedAtMF( this, SW_RES(MF_ALIGNED_AT) ),
- aIndentAtFT( this, SW_RES(FT_INDENT_AT) ),
- aIndentAtMF( this, SW_RES(MF_INDENT_AT) ),
- aStandardPB( this, SW_RES(PB_STANDARD )),
-
- aPreviewWIN( this, SW_RES(WIN_PREVIEW )),
-
- pActNum(0),
- pSaveNum(0),
- pWrtSh(0),
- pOutlineDlg(0),
- bPreset( sal_False ),
- bInInintControl(sal_False),
- bLabelAlignmentPosAndSpaceModeActive( false )
+ const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "NumberingPositionPage",
+ "modules/swriter/ui/numberingpositionpage.ui", rSet)
+ , pActNum(0)
+ , pSaveNum(0)
+ , pWrtSh(0)
+ , pOutlineDlg(0)
+ , bPreset( sal_False )
+ , bInInintControl(sal_False)
+ , bLabelAlignmentPosAndSpaceModeActive( false )
{
- FreeResource();
+ get(m_pLevelLB, "levellb");
+ m_pLevelLB->EnableMultiSelection(true);
+ get(m_pPositionFrame, "numberingframe");
+ get(m_pDistBorderFT, "indent");
+ get(m_pDistBorderMF, "indentmf");
+ get(m_pRelativeCB, "relative");
+ get(m_pIndentFT, "numberingwidth");
+ get(m_pIndentMF, "numberingwidthmf");
+ get(m_pDistNumFT, "numdist");
+ get(m_pDistNumMF, "numdistmf");
+ get(m_pAlignFT, "numalign");
+ get(m_pAlignLB, "numalignlb");
+
+ get(m_pLabelFollowedByFT, "numfollowedby");
+ get(m_pLabelFollowedByLB, "numfollowedbylb");
+ get(m_pListtabFT, "at");
+ get(m_pListtabMF, "atmf");
+ get(m_pAlign2FT, "num2align");
+ get(m_pAlign2LB, "num2alignlb");
+ get(m_pAlignedAtFT, "alignedat");
+ get(m_pAlignedAtMF, "alignedatmf");
+ get(m_pIndentAtFT, "indentat");
+ get(m_pIndentAtMF, "indentatmf");
+ get(m_pStandardPB, "standard");
+
+ get(m_pPreviewWIN, "preview");
+
SetExchangeSupport();
- aPreviewWIN.SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
- aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
+ m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget());
- aRelativeCB.Check();
- aAlignLB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
- aAlign2LB.SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
- for ( sal_uInt16 i = 0; i < aAlignLB.GetEntryCount(); ++i )
+ m_pRelativeCB->Check();
+ m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
+ m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
+ for ( sal_uInt16 i = 0; i < m_pAlignLB->GetEntryCount(); ++i )
{
- aAlign2LB.InsertEntry( aAlignLB.GetEntry( i ) );
+ m_pAlign2LB->InsertEntry( m_pAlignLB->GetEntry( i ) );
}
- aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() );
- aAlign2FT.SetText( aAlignFT.GetText() );
+ m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() );
+ m_pAlign2FT->SetText( m_pAlignFT->GetText() );
Link aLk = LINK(this, SwNumPositionTabPage, DistanceHdl);
- aDistBorderMF.SetUpHdl(aLk);
- aDistNumMF.SetUpHdl(aLk);
- aIndentMF.SetUpHdl(aLk);
- aDistBorderMF.SetDownHdl(aLk);
- aDistNumMF.SetDownHdl(aLk);
- aIndentMF.SetDownHdl(aLk);
- aDistBorderMF.SetLoseFocusHdl(aLk);
- aDistNumMF.SetLoseFocusHdl(aLk);
- aIndentMF.SetLoseFocusHdl(aLk);
-
- aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() );
- aLabelFollowedByLB.SetSelectHdl( LINK(this, SwNumPositionTabPage, LabelFollowedByHdl_Impl) );
+ m_pDistBorderMF->SetUpHdl(aLk);
+ m_pDistNumMF->SetUpHdl(aLk);
+ m_pIndentMF->SetUpHdl(aLk);
+ m_pDistBorderMF->SetDownHdl(aLk);
+ m_pDistNumMF->SetDownHdl(aLk);
+ m_pIndentMF->SetDownHdl(aLk);
+ m_pDistBorderMF->SetLoseFocusHdl(aLk);
+ m_pDistNumMF->SetLoseFocusHdl(aLk);
+ m_pIndentMF->SetLoseFocusHdl(aLk);
+
+ m_pLabelFollowedByLB->SetDropDownLineCount( m_pLabelFollowedByLB->GetEntryCount() );
+ m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SwNumPositionTabPage, LabelFollowedByHdl_Impl) );
aLk = LINK(this, SwNumPositionTabPage, ListtabPosHdl_Impl);
- aListtabMF.SetUpHdl(aLk);
- aListtabMF.SetDownHdl(aLk);
- aListtabMF.SetLoseFocusHdl(aLk);
+ m_pListtabMF->SetUpHdl(aLk);
+ m_pListtabMF->SetDownHdl(aLk);
+ m_pListtabMF->SetLoseFocusHdl(aLk);
aLk = LINK(this, SwNumPositionTabPage, AlignAtHdl_Impl);
- aAlignedAtMF.SetUpHdl(aLk);
- aAlignedAtMF.SetDownHdl(aLk);
- aAlignedAtMF.SetLoseFocusHdl(aLk);
+ m_pAlignedAtMF->SetUpHdl(aLk);
+ m_pAlignedAtMF->SetDownHdl(aLk);
+ m_pAlignedAtMF->SetLoseFocusHdl(aLk);
aLk = LINK(this, SwNumPositionTabPage, IndentAtHdl_Impl);
- aIndentAtMF.SetUpHdl(aLk);
- aIndentAtMF.SetDownHdl(aLk);
- aIndentAtMF.SetLoseFocusHdl(aLk);
+ m_pIndentAtMF->SetUpHdl(aLk);
+ m_pIndentAtMF->SetDownHdl(aLk);
+ m_pIndentAtMF->SetLoseFocusHdl(aLk);
- aLevelLB.SetSelectHdl(LINK(this, SwNumPositionTabPage, LevelHdl));
- aRelativeCB.SetClickHdl(LINK(this, SwNumPositionTabPage, RelativeHdl));
- aStandardPB.SetClickHdl(LINK(this, SwNumPositionTabPage, StandardHdl));
+ m_pLevelLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, LevelHdl));
+ m_pRelativeCB->SetClickHdl(LINK(this, SwNumPositionTabPage, RelativeHdl));
+ m_pStandardPB->SetClickHdl(LINK(this, SwNumPositionTabPage, StandardHdl));
// insert levels
for(sal_uInt16 i = 1; i <= MAXLEVEL; i++)
- aLevelLB.InsertEntry(String::CreateFromInt32(i));
+ m_pLevelLB->InsertEntry(String::CreateFromInt32(i));
String sEntry(rtl::OUString("1 - "));
sEntry += String::CreateFromInt32(MAXLEVEL);
- aLevelLB.InsertEntry(sEntry);
- aLevelLB.SelectEntry(sEntry);
+ m_pLevelLB->InsertEntry(sEntry);
+ m_pLevelLB->SelectEntry(sEntry);
- aRelativeCB.Check(bLastRelative);
- aPreviewWIN.SetPositionMode();
+ m_pRelativeCB->Check(bLastRelative);
+ m_pPreviewWIN->SetPositionMode();
}
SwNumPositionTabPage::~SwNumPositionTabPage()
@@ -166,13 +166,13 @@ void SwNumPositionTabPage::InitControls()
{
bInInintControl = sal_True;
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
- aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
- const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
+ m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked();
+ const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 &&
USHRT_MAX != nActNumLvl;
- aDistBorderMF.Enable( !bLabelAlignmentPosAndSpaceModeActive &&
+ m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
( bSingleSelection || bRelative || pOutlineDlg != 0 ) );
- aDistBorderFT.Enable( !bLabelAlignmentPosAndSpaceModeActive &&
+ m_pDistBorderFT->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
( bSingleSelection || bRelative || pOutlineDlg != 0 ) );
bool bSetDistEmpty = false;
@@ -262,19 +262,19 @@ void SwNumPositionTabPage::InitControls()
{
nDistBorderNum = (long)aNumFmtArr[nLvl]->GetAbsLSpace()+ aNumFmtArr[nLvl]->GetFirstLineOffset();
}
- aDistBorderMF.SetValue(aDistBorderMF.Normalize(nDistBorderNum),FUNIT_TWIP);
+ m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nDistBorderNum),FUNIT_TWIP);
}
else
bSetDistEmpty = sal_True;
if(bSameDist)
- aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
+ m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
else
- aDistNumMF.SetText(aEmptyStr);
+ m_pDistNumMF->SetText(aEmptyStr);
if(bSameIndent)
- aIndentMF.SetValue(aIndentMF.Normalize(-aNumFmtArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP);
+ m_pIndentMF->SetValue(m_pIndentMF->Normalize(-aNumFmtArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP);
else
- aIndentMF.SetText(aEmptyStr);
+ m_pIndentMF->SetText(aEmptyStr);
if(bSameAdjust)
{
@@ -283,13 +283,13 @@ void SwNumPositionTabPage::InitControls()
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
nPos = 2;
- aAlignLB.SelectEntryPos(nPos);
- aAlign2LB.SelectEntryPos( nPos );
+ m_pAlignLB->SelectEntryPos(nPos);
+ m_pAlign2LB->SelectEntryPos( nPos );
}
else
{
- aAlignLB.SetNoSelection();
- aAlign2LB.SetNoSelection();
+ m_pAlignLB->SetNoSelection();
+ m_pAlign2LB->SetNoSelection();
}
if ( bSameLabelFollowedBy )
@@ -303,57 +303,57 @@ void SwNumPositionTabPage::InitControls()
{
nPos = 2;
}
- aLabelFollowedByLB.SelectEntryPos( nPos );
+ m_pLabelFollowedByLB->SelectEntryPos( nPos );
}
else
{
- aLabelFollowedByLB.SetNoSelection();
+ m_pLabelFollowedByLB->SetNoSelection();
}
if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
{
- aListtabFT.Enable( true );
- aListtabMF.Enable( true );
+ m_pListtabFT->Enable( true );
+ m_pListtabMF->Enable( true );
if ( bSameListtab )
{
- aListtabMF.SetValue(aListtabMF.Normalize(aNumFmtArr[nLvl]->GetListtabPos()),FUNIT_TWIP);
+ m_pListtabMF->SetValue(m_pListtabMF->Normalize(aNumFmtArr[nLvl]->GetListtabPos()),FUNIT_TWIP);
}
else
{
- aListtabMF.SetText(aEmptyStr);
+ m_pListtabMF->SetText(aEmptyStr);
}
}
else
{
- aListtabFT.Enable( false );
- aListtabMF.Enable( false );
- aListtabMF.SetText(aEmptyStr);
+ m_pListtabFT->Enable( false );
+ m_pListtabMF->Enable( false );
+ m_pListtabMF->SetText(aEmptyStr);
}
if ( bSameAlignAt )
{
- aAlignedAtMF.SetValue(
- aAlignedAtMF.Normalize( aNumFmtArr[nLvl]->GetIndentAt() +
+ m_pAlignedAtMF->SetValue(
+ m_pAlignedAtMF->Normalize( aNumFmtArr[nLvl]->GetIndentAt() +
aNumFmtArr[nLvl]->GetFirstLineIndent()),
FUNIT_TWIP );
}
else
{
- aAlignedAtMF.SetText(aEmptyStr);
+ m_pAlignedAtMF->SetText(aEmptyStr);
}
if ( bSameIndentAt )
{
- aIndentAtMF.SetValue(
- aIndentAtMF.Normalize( aNumFmtArr[nLvl]->GetIndentAt()), FUNIT_TWIP );
+ m_pIndentAtMF->SetValue(
+ m_pIndentAtMF->Normalize( aNumFmtArr[nLvl]->GetIndentAt()), FUNIT_TWIP );
}
else
{
- aIndentAtMF.SetText(aEmptyStr);
+ m_pIndentAtMF->SetText(aEmptyStr);
}
if(sal_True == bSetDistEmpty)
- aDistBorderMF.SetText(aEmptyStr);
+ m_pDistBorderMF->SetText(aEmptyStr);
bInInintControl = sal_False;
}
@@ -375,25 +375,25 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
*pActNum = *pSaveNum;
nActNumLvl = nTmpNumLvl;
sal_uInt16 nMask = 1;
- aLevelLB.SetUpdateMode(sal_False);
- aLevelLB.SetNoSelection();
- aLevelLB.SelectEntryPos( MAXLEVEL, nActNumLvl == USHRT_MAX);
+ m_pLevelLB->SetUpdateMode(sal_False);
+ m_pLevelLB->SetNoSelection();
+ m_pLevelLB->SelectEntryPos( MAXLEVEL, nActNumLvl == USHRT_MAX);
if(nActNumLvl != USHRT_MAX)
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, sal_True);
+ m_pLevelLB->SelectEntryPos( i, sal_True);
nMask <<= 1 ;
}
- aLevelLB.SetUpdateMode(sal_True);
+ m_pLevelLB->SetUpdateMode(sal_True);
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
InitControls();
}
- aRelativeCB.Enable(1 != nActNumLvl);
- aPreviewWIN.Invalidate();
+ m_pRelativeCB->Enable(1 != nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
@@ -424,33 +424,33 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
if(pOutlineDlg)
{
pSaveNum = pOutlineDlg->GetNumRule();
- aLevelLB.EnableMultiSelection(sal_False);
+ m_pLevelLB->EnableMultiSelection(sal_False);
}
else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, sal_False, &pItem))
pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule();
nActNumLvl = SwOutlineTabDialog::GetActNumLevel();
sal_uInt16 nMask = 1;
- aLevelLB.SetUpdateMode(sal_False);
- aLevelLB.SetNoSelection();
+ m_pLevelLB->SetUpdateMode(sal_False);
+ m_pLevelLB->SetNoSelection();
if(nActNumLvl == USHRT_MAX)
{
- aLevelLB.SelectEntryPos( MAXLEVEL, sal_True);
+ m_pLevelLB->SelectEntryPos( MAXLEVEL, sal_True);
}
else
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActNumLvl & nMask)
- aLevelLB.SelectEntryPos( i, sal_True);
+ m_pLevelLB->SelectEntryPos( i, sal_True);
nMask <<= 1;
}
- aLevelLB.SetUpdateMode(sal_True);
+ m_pLevelLB->SetUpdateMode(sal_True);
if(!pActNum)
pActNum = new SwNumRule(*pSaveNum);
else if(*pSaveNum != *pActNum)
*pActNum = *pSaveNum;
- aPreviewWIN.SetNumRule(pActNum);
+ m_pPreviewWIN->SetNumRule(pActNum);
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
InitControls();
@@ -488,26 +488,26 @@ void SwNumPositionTabPage::InitPosAndSpaceMode()
void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
{
- aDistBorderFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aDistBorderMF.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aRelativeCB.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aIndentFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aIndentMF.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aDistNumFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aDistNumMF.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aAlignFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
- aAlignLB.Show( !bLabelAlignmentPosAndSpaceModeActive );
-
- aLabelFollowedByFT.Show( bLabelAlignmentPosAndSpaceModeActive );
- aLabelFollowedByLB.Show( bLabelAlignmentPosAndSpaceModeActive );
- aListtabFT.Show( bLabelAlignmentPosAndSpaceModeActive );
- aListtabMF.Show( bLabelAlignmentPosAndSpaceModeActive );
- aAlign2FT.Show( bLabelAlignmentPosAndSpaceModeActive );
- aAlign2LB.Show( bLabelAlignmentPosAndSpaceModeActive );
- aAlignedAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
- aAlignedAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
- aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
- aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pDistBorderFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pDistBorderMF->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pRelativeCB->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pIndentFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pIndentMF->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pDistNumFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pDistNumMF->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlignFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlignLB->Show( !bLabelAlignmentPosAndSpaceModeActive );
+
+ m_pLabelFollowedByFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pLabelFollowedByLB->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pListtabFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pListtabMF->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlign2FT->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlign2LB->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlignedAtFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pAlignedAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pIndentAtFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+ m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
}
SfxTabPage* SwNumPositionTabPage::Create( Window* pParent,
@@ -522,38 +522,38 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
const SwTwips nWidth = pWrtSh->GetAnyCurRect(RECT_FRM).Width();
- aDistBorderMF.SetMax(aDistBorderMF.Normalize( nWidth ), FUNIT_TWIP );
- aDistNumMF .SetMax(aDistNumMF .Normalize( nWidth ), FUNIT_TWIP );
- aIndentMF .SetMax(aIndentMF .Normalize( nWidth ), FUNIT_TWIP );
- aListtabMF.SetMax(aListtabMF.Normalize( nWidth ), FUNIT_TWIP );
- aAlignedAtMF.SetMax(aAlignedAtMF.Normalize( nWidth ), FUNIT_TWIP );
- aIndentAtMF.SetMax(aIndentAtMF.Normalize( nWidth ), FUNIT_TWIP );
+ m_pDistBorderMF->SetMax(m_pDistBorderMF->Normalize( nWidth ), FUNIT_TWIP );
+ m_pDistNumMF->SetMax(m_pDistNumMF->Normalize( nWidth ), FUNIT_TWIP);
+ m_pIndentMF->SetMax(m_pIndentMF->Normalize( nWidth ), FUNIT_TWIP );
+ m_pListtabMF->SetMax(m_pListtabMF->Normalize( nWidth ), FUNIT_TWIP );
+ m_pAlignedAtMF->SetMax(m_pAlignedAtMF->Normalize( nWidth ), FUNIT_TWIP );
+ m_pIndentAtMF->SetMax(m_pIndentAtMF->Normalize( nWidth ), FUNIT_TWIP );
const SwTwips nLast2 = nWidth /2;
- aDistBorderMF.SetLast( aDistBorderMF.Normalize( nLast2 ), FUNIT_TWIP );
- aDistNumMF .SetLast( aDistNumMF .Normalize( nLast2 ), FUNIT_TWIP );
- aIndentMF .SetLast( aIndentMF .Normalize( nLast2 ), FUNIT_TWIP );
- aListtabMF.SetLast(aListtabMF.Normalize( nLast2 ), FUNIT_TWIP );
- aAlignedAtMF.SetLast(aAlignedAtMF.Normalize( nLast2 ), FUNIT_TWIP );
- aIndentAtMF.SetLast(aIndentAtMF.Normalize( nLast2 ), FUNIT_TWIP );
+ m_pDistBorderMF->SetLast( m_pDistBorderMF->Normalize( nLast2 ), FUNIT_TWIP );
+ m_pDistNumMF->SetLast(m_pDistNumMF->Normalize( nLast2 ), FUNIT_TWIP);
+ m_pIndentMF->SetLast(m_pIndentMF->Normalize( nLast2 ), FUNIT_TWIP );
+ m_pListtabMF->SetLast(m_pListtabMF->Normalize( nLast2 ), FUNIT_TWIP );
+ m_pAlignedAtMF->SetLast(m_pAlignedAtMF->Normalize( nLast2 ), FUNIT_TWIP );
+ m_pIndentAtMF->SetLast(m_pIndentAtMF->Normalize( nLast2 ), FUNIT_TWIP );
const SwRect& rPrtRect = pWrtSh->GetAnyCurRect(RECT_PAGE);
- aPreviewWIN.SetPageWidth(rPrtRect.Width());
+ m_pPreviewWIN->SetPageWidth(rPrtRect.Width());
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &pWrtSh->GetView()));
if(eMetric == FUNIT_MM)
{
- aDistBorderMF .SetDecimalDigits(1);
- aDistNumMF .SetDecimalDigits(1);
- aIndentMF .SetDecimalDigits(1);
- aListtabMF.SetDecimalDigits(1);
- aAlignedAtMF.SetDecimalDigits(1);
- aIndentAtMF.SetDecimalDigits(1);
- }
- aDistBorderMF .SetUnit( eMetric );
- aDistNumMF .SetUnit( eMetric );
- aIndentMF .SetUnit( eMetric );
- aListtabMF.SetUnit( eMetric );
- aAlignedAtMF.SetUnit( eMetric );
- aIndentAtMF.SetUnit( eMetric );
+ m_pDistBorderMF->SetDecimalDigits(1);
+ m_pDistNumMF->SetDecimalDigits(1);
+ m_pIndentMF->SetDecimalDigits(1);
+ m_pListtabMF->SetDecimalDigits(1);
+ m_pAlignedAtMF->SetDecimalDigits(1);
+ m_pIndentAtMF->SetDecimalDigits(1);
+ }
+ m_pDistBorderMF->SetUnit( eMetric );
+ m_pDistNumMF->SetUnit( eMetric );
+ m_pIndentMF->SetUnit( eMetric );
+ m_pListtabMF->SetUnit( eMetric );
+ m_pAlignedAtMF->SetUnit( eMetric );
+ m_pIndentAtMF->SetUnit( eMetric );
}
IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl)
@@ -565,9 +565,9 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl)
{
SwNumFmt aNumFmt(pActNum->Get(i));
- const sal_uInt16 nPos = aAlignLB.IsVisible()
- ? aAlignLB.GetSelectEntryPos()
- : aAlign2LB.GetSelectEntryPos();
+ const sal_uInt16 nPos = m_pAlignLB->IsVisible()
+ ? m_pAlignLB->GetSelectEntryPos()
+ : m_pAlign2LB->GetSelectEntryPos();
SvxAdjust eAdjust = SVX_ADJUST_CENTER;
if(nPos == 0)
eAdjust = SVX_ADJUST_LEFT;
@@ -620,7 +620,7 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox )
nMask <<=1;
}
}
- aRelativeCB.Enable(1 != nActNumLvl);
+ m_pRelativeCB->Enable(1 != nActNumLvl);
SetModified();
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
@@ -639,10 +639,10 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
if(nActNumLvl & nMask)
{
SwNumFmt aNumFmt( pActNum->Get( i ) );
- if(pFld == &aDistBorderMF)
+ if(pFld == m_pDistBorderMF)
{
- if(aRelativeCB.IsChecked() && aRelativeCB.IsEnabled())
+ if(m_pRelativeCB->IsChecked() && m_pRelativeCB->IsEnabled())
{
if(0 == i)
{
@@ -663,11 +663,11 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
aNumFmt.SetAbsLSpace( (short)nValue - aNumFmt.GetFirstLineOffset());
}
}
- else if(pFld == &aDistNumMF)
+ else if (pFld == m_pDistNumMF)
{
aNumFmt.SetCharTextDistance( (short)nValue );
}
- else if(pFld == &aIndentMF)
+ else if (pFld == m_pIndentMF)
{
// now AbsLSpace also has to be modified by FirstLineOffset
long nDiff = nValue + aNumFmt.GetFirstLineOffset();
@@ -682,8 +682,8 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
}
SetModified();
- if(!aDistBorderMF.IsEnabled())
- aDistBorderMF.SetText(aEmptyStr);
+ if(!m_pDistBorderMF->IsEnabled())
+ m_pDistBorderMF->SetText(aEmptyStr);
return 0;
}
@@ -691,7 +691,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
{
sal_Bool bOn = pBox->IsChecked();
- sal_Bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
+ sal_Bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
sal_Bool bSetValue = sal_False;
long nValue = 0;
if(bOn || bSingleSelection)
@@ -719,10 +719,10 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
}
if(bSetValue)
- aDistBorderMF.SetValue(aDistBorderMF.Normalize(nValue), FUNIT_TWIP);
+ m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nValue), FUNIT_TWIP);
else
- aDistBorderMF.SetText(aEmptyStr);
- aDistBorderMF.Enable(bOn || bSingleSelection||0 != pOutlineDlg);
+ m_pDistBorderMF->SetText(aEmptyStr);
+ m_pDistBorderMF->Enable(bOn || bSingleSelection||0 != pOutlineDlg);
bLastRelative = bOn;
return 0;
}
@@ -732,7 +732,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
// determine value to be set at the chosen list levels
SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
{
- const sal_uInt16 nPos = aLabelFollowedByLB.GetSelectEntryPos();
+ const sal_uInt16 nPos = m_pLabelFollowedByLB->GetSelectEntryPos();
if ( nPos == 1 )
{
eLabelFollowedBy = SvxNumberFormat::SPACE;
@@ -770,17 +770,17 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
// enable/disable metric field for list tab stop position depending on
// selected item following the list label.
- aListtabFT.Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
- aListtabMF.Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
+ m_pListtabFT->Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
+ m_pListtabMF->Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
if ( bSameListtabPos && eLabelFollowedBy == SvxNumberFormat::LISTTAB )
{
- aListtabMF.SetValue(
- aListtabMF.Normalize( pActNum->Get( nFirstLvl ).GetListtabPos() ),
+ m_pListtabMF->SetValue(
+ m_pListtabMF->Normalize( pActNum->Get( nFirstLvl ).GetListtabPos() ),
FUNIT_TWIP );
}
else
{
- aListtabMF.SetText( String() );
+ m_pListtabMF->SetText( String() );
}
SetModified();
@@ -905,8 +905,8 @@ void SwNumPositionTabPage::SetModified(sal_Bool bRepaint)
bModified = sal_True;
if(bRepaint)
{
- aPreviewWIN.SetLevel(nActNumLvl);
- aPreviewWIN.Invalidate();
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
}
#endif
diff --git a/sw/source/ui/misc/num.hrc b/sw/source/ui/misc/num.hrc
index e99a761..c2c9c4a 100644
--- a/sw/source/ui/misc/num.hrc
+++ b/sw/source/ui/misc/num.hrc
@@ -16,31 +16,4 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define FL_LEVEL 1
-#define LB_LEVEL 2
-#define FL_POSITION 3
-#define FT_BORDERDIST 4
-#define MF_BORDERDIST 5
-#define CB_RELATIVE 6
-#define FT_INDENT 7
-#define MF_INDENT 8
-#define FT_NUMDIST 9
-#define MF_NUMDIST 10
-#define FT_ALIGN 11
-#define LB_ALIGN 12
-#define PB_STANDARD 13
-#define WIN_PREVIEW 15
-#define ST_RESET 16
-
-#define FT_LABEL_FOLLOWED_BY 17
-#define LB_LABEL_FOLLOWED_BY 18
-#define FT_LISTTAB 19
-#define MF_LISTTAB 20
-#define FT_ALIGN_2 21
-#define LB_ALIGN_2 22
-#define FT_ALIGNED_AT 23
-#define MF_ALIGNED_AT 24
-#define FT_INDENT_AT 25
-#define MF_INDENT_AT 26
-
+#define ST_RESET 1
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index 42a31d8..f6efa09 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -27,266 +27,6 @@
/**************************************************************************/
/* */
-/* TabPage positions */
-/* */
-/**************************************************************************/
-TabPage TP_NUM_POSITION
-{
- HelpID = HID_NUM_POSITION ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE;
- FixedLine FL_LEVEL
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
- Text [ en-US ] = "Level" ;
- };
- MultiListBox LB_LEVEL
- {
- HelpID = "sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 26 , 163 ) ;
- TabStop = TRUE ;
- DropDown = FALSE ;
- Border = TRUE ;
- SimpleMode = TRUE ;
- };
- FixedLine FL_POSITION
- {
- Pos = MAP_APPFONT ( 47 , 3 ) ;
- Size = MAP_APPFONT ( 207 , 8 ) ;
- Group = TRUE ;
- Text [ en-US ] = "Position and spacing" ;
- };
- FixedText FT_BORDERDIST
- {
- Pos = MAP_APPFONT ( 50 , 27 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "Indent" ;
- };
- MetricField MF_BORDERDIST
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST";
- Pos = MAP_APPFONT ( 198 , 25 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -1999 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- };
- CheckBox CB_RELATIVE
- {
- HelpID = "sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE";
- Pos = MAP_APPFONT ( 198 , 41 ) ;
- Size = MAP_APPFONT ( 52 , 10 ) ;
- Text [ en-US ] = "Relati~ve" ;
- };
- FixedText FT_INDENT
- {
- Pos = MAP_APPFONT ( 50 , 59 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- Text [ en-US ] = "Width of numbering" ;
- };
- MetricField MF_INDENT
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT";
- Pos = MAP_APPFONT ( 198 , 57 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- };
- FixedText FT_NUMDIST
- {
- Pos = MAP_APPFONT ( 50 , 75 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- Text [ en-US ] = "Minimum space numbering <-> text" ;
- };
- MetricField MF_NUMDIST
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_NUMDIST";
- Pos = MAP_APPFONT ( 198 , 73 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- Border = TRUE ;
- TabStop = TRUE ;
- };
- FixedText FT_ALIGN
- {
- Pos = MAP_APPFONT ( 50 , 91 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- Text [ en-US ] = "N~umbering alignment" ;
- };
- ListBox LB_ALIGN
- {
- HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN";
- Pos = MAP_APPFONT ( 198 , 89 ) ;
- Size = MAP_APPFONT ( 40 , 40 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Left" ; > ;
- < "Centered" ; > ;
- < "Right" ; > ;
- };
- };
- FixedText FT_LABEL_FOLLOWED_BY
- {
- Pos = MAP_APPFONT ( 50 , 27 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "Numbering followed by" ;
- };
- ListBox LB_LABEL_FOLLOWED_BY
- {
- HelpID = "sw:ListBox:TP_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
- Pos = MAP_APPFONT ( 198 , 25 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Tab stop" ; > ;
- < "Space" ; > ;
- < "Nothing" ; > ;
- };
- };
- FixedText FT_LISTTAB
- {
- Pos = MAP_APPFONT ( 50 , 43 ) ;
- Size = MAP_APPFONT ( 143 , 10 ) ;
- Right = TRUE ;
- Text [ en-US ] = "at" ;
- };
- MetricField MF_LISTTAB
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_LISTTAB";
- Pos = MAP_APPFONT ( 198 , 41 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- };
- FixedText FT_ALIGN_2
- {
- Pos = MAP_APPFONT ( 50 , 59 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- };
- ListBox LB_ALIGN_2
- {
- HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN_2";
- Pos = MAP_APPFONT ( 198 , 57 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_ALIGNED_AT
- {
- Pos = MAP_APPFONT ( 50 , 75 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- Text [ en-US ] = "Aligned at" ;
- };
- MetricField MF_ALIGNED_AT
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_ALIGNED_AT";
- Pos = MAP_APPFONT ( 198 , 73 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -1999 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- Border = TRUE ;
- TabStop = TRUE ;
- };
- FixedText FT_INDENT_AT
- {
- Pos = MAP_APPFONT ( 50 , 91 ) ;
- Size = MAP_APPFONT ( 105 , 8 ) ;
- Text [ en-US ] = "Indent at" ;
- };
- MetricField MF_INDENT_AT
- {
- HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT_AT";
- Pos = MAP_APPFONT ( 198 , 89 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -1999 ;
- Maximum = 1999 ;
- DecimalDigits = 2 ;
- Value = 0 ;
- Unit = FUNIT_CM ;
- First = 0 ;
- Last = 1999 ;
- SpinSize = 5 ;
- Border = TRUE ;
- TabStop = TRUE ;
- };
- PushButton PB_STANDARD
- {
- HelpID = "sw:PushButton:TP_NUM_POSITION:PB_STANDARD";
- Pos = MAP_APPFONT ( 198 , 165 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "Default" ;
- };
- Window WIN_PREVIEW
- {
- Pos = MAP_APPFONT ( 50 , 113 ) ;
- Size = MAP_APPFONT ( 143 , 67 ) ;
- Border = TRUE ;
- };
-};
-
-/**************************************************************************/
-/* */
/* dialog for Svx-implementation's test */
/* */
/**************************************************************************/
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 8ae1824..94f0c48 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -906,6 +906,11 @@ static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, sa
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumberingPreview(Window *pParent, VclBuilder::stringmap &)
+{
+ return new NumberingPreview(pParent);
+}
+
/*--------------------------------------------------
paint numbering's preview
--------------------------------------------------*/
diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
deleted file mode 100644
index 7ac98cd..0000000
--- a/sw/uiconfig/sw/ui/20872.ui
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">19.989999999999998</property>
- <property name="step_increment">0.050000000000000003</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="lower">-19.989999999999998</property>
- <property name="upper">19.989999999999998</property>
- <property name="step_increment">0.050000000000000003</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Left</col>
- </row>
- <row>
- <col id="0" translatable="yes">Centered</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Tab stop</col>
- </row>
- <row>
- <col id="0" translatable="yes">Space</col>
- </row>
- <row>
- <col id="0" translatable="yes">Nothing</col>
- </row>
- </data>
- </object>
- <object class="GtkBox" id="20872">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkTreeView" id="2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection6"/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Level</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="frame4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="box6">
- <property name="visible">True</property>
- <property name="can_focus">False</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="row_spacing">6</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="17">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Numbering followed by</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="21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Numbering Alignment</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="GtkLabel" id="23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Aligned at</property>
- </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>
- <child>
- <object class="GtkLabel" id="25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Indent at</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="26:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">at</property>
- </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="GtkSpinButton" id="20:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- <property name="digits">2</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>
- <child>
- <object class="GtkSpinButton" id="24:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="18">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore2</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="GtkDrawingArea" id="15">
- <property name="width_request">300</property>
- <property name="height_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">10</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="13">
- <property name="label" translatable="yes">Default</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">end</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">10</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Indent</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="5:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="6">
- <property name="label" translatable="yes">Relative</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Width of numbering</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="8:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="10:0.00cm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Minimum space numbering <-> textlabel</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Numbering alignment</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">9</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">9</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>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Position and spacing</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
-</interface>
diff --git a/sw/uiconfig/swriter/ui/numberingpositionpage.ui b/sw/uiconfig/swriter/ui/numberingpositionpage.ui
new file mode 100644
index 0000000..11cf1a7
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/numberingpositionpage.ui
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">19.989999999999998</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">-19.989999999999998</property>
+ <property name="upper">19.989999999999998</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="NumberingPositionPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTreeView" id="levellb">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection6">
+ <property name="mode">multiple</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Level</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="numberingframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="row_spacing">6</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="numfollowedby">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Numbering followed by</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="num2align">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Numbering Alignment</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="GtkLabel" id="alignedat">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Aligned at</property>
+ </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>
+ <child>
+ <object class="GtkLabel" id="indentat">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Indent at</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="num2alignlb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="indentatmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="at">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">at</property>
+ </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="GtkSpinButton" id="atmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="digits">2</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>
+ <child>
+ <object class="GtkSpinButton" id="alignedatmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="numfollowedbylb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</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="swuilo:NumberingPreview" id="preview">
+ <property name="width_request">300</property>
+ <property name="height_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="standard">
+ <property name="label" translatable="yes">Default</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">end</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="indent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Indent</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="indentmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="relative">
+ <property name="label" translatable="yes">Relative</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="numberingwidth">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Width of numbering</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="numberingwidthmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="numdistmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="numdist">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Minimum space numbering <-> textlabel</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="numalign">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Numbering alignment</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="numalignlb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Position and spacing</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Centered</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Tab stop</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Space</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Nothing</col>
+ </row>
+ </data>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list