summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/Module_sw.mk1
-rw-r--r--sw/UI_sw.mk16
-rw-r--r--sw/UI_swriter.mk3
-rw-r--r--sw/inc/globals.hrc2
-rw-r--r--sw/inc/helpid.h1
-rw-r--r--sw/source/ui/app/app.src5
-rw-r--r--sw/source/ui/inc/num.hxx4
-rw-r--r--sw/source/ui/inc/outline.hxx33
-rw-r--r--sw/source/ui/misc/num.cxx4
-rw-r--r--sw/source/ui/misc/outline.cxx175
-rw-r--r--sw/source/ui/misc/outline.hrc14
-rw-r--r--sw/source/ui/misc/outline.src181
-rw-r--r--sw/uiconfig/swriter/ui/outlinenumberingpage.ui (renamed from sw/uiconfig/sw/ui/20876.ui)40
-rw-r--r--sw/uiconfig/swriter/ui/outlinepositionpage.ui (renamed from sw/uiconfig/swriter/ui/numberingpositionpage.ui)2
14 files changed, 130 insertions, 351 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 6fb0622618e9..6abd3212cc7b 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_swd \
Library_swui \
Package_uiconfig \
- UI_sw \
UI_swriter \
))
diff --git a/sw/UI_sw.mk b/sw/UI_sw.mk
deleted file mode 100644
index a0f2a366f1d4..000000000000
--- a/sw/UI_sw.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,sw))
-
-$(eval $(call gb_UI_add_uifiles,sw,\
- sw/uiconfig/sw/ui/20876 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 219ff5781a80..e32720791b54 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -24,7 +24,8 @@ $(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/outlinenumberingpage \
+ sw/uiconfig/swriter/ui/outlinepositionpage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index a7ed844a4afb..cf206a546744 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -67,6 +67,8 @@
#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
+#define STR_NO_COLL (RC_GLOBALS_BEGIN + 41)
+
// DIALOGS -----------------------------------------------------------
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 38162ad476ef..8c31ca4f448d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -197,7 +197,6 @@
#define HID_EDIT_FLD_FUNC "SW_HID_EDIT_FLD_FUNC"
#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
-#define HID_TP_OUTLINE_NUM "SW_HID_TP_OUTLINE_NUM"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_OPTLOAD_PAGE "SW_HID_OPTLOAD_PAGE"
#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 2af7888aef49..45064b1239d2 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -235,6 +235,11 @@ String STR_REMOVE_WARNING
Text [ en-US ] = "The following characters are not valid and have been removed: ";
};
+String STR_NO_COLL
+{
+ Text [ en-US ] = "(none)" ;
+};
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 4a934fa7ec41..379cc230bb88 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -137,8 +137,8 @@ public:
{ bModified = sal_True;
if(bRepaint)
{
- aPreviewWIN.SetLevel(nActNumLvl);
- aPreviewWIN.Invalidate();
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
}
#endif
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index e20817a3ccf4..8ffadb3306c7 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -81,26 +81,17 @@ class SwOutlineTabDialog : public SfxTabDialog
class SwOutlineSettingsTabPage : public SfxTabPage
{
- FixedLine aLevelFL;
- ListBox aLevelLB;
-
- FixedLine aNumberFL;
- FixedText aCollLbl;
- ListBox aCollBox;
- FixedText aNumberLbl;
- SwNumberingTypeListBox aNumberBox;
- FixedText aCharFmtFT;
- ListBox aCharFmtLB;
- FixedText aAllLevelFT;
- NumericField aAllLevelNF;
- FixedText aDelim;
- FixedText aPrefixFT;
- Edit aPrefixED;
- FixedText aSuffixFT;
- Edit aSuffixED;
- FixedText aStartLbl;
- NumericField aStartEdit;
- NumberingPreview aPreviewWIN;
+ ListBox* m_pLevelLB;
+
+ ListBox* m_pCollBox;
+ SwNumberingTypeListBox* m_pNumberBox;
+ ListBox* m_pCharFmtLB;
+ FixedText* m_pAllLevelFT;
+ NumericField* m_pAllLevelNF;
+ Edit* m_pPrefixED;
+ Edit* m_pSuffixED;
+ NumericField* m_pStartEdit;
+ NumberingPreview* m_pPreviewWIN;
String aNoFmtName;
String aSaveCollNames[MAXLEVEL];
@@ -120,7 +111,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
void Update();
- void SetModified(){aPreviewWIN.Invalidate();}
+ void SetModified(){m_pPreviewWIN->Invalidate();}
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
using SfxTabPage::ActivatePage;
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index f22dc720f8c2..87ad5b38df8d 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -59,8 +59,8 @@ static sal_Bool bLastRelative = sal_False;
SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "NumberingPositionPage",
- "modules/swriter/ui/numberingpositionpage.ui", rSet)
+ : SfxTabPage(pParent, "OutlinePositionPage",
+ "modules/swriter/ui/outlinepositionpage.ui", rSet)
, pActNum(0)
, pSaveNum(0)
, pWrtSh(0)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 94f0c48500a3..48cfd5cfa712 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -416,53 +416,44 @@ short SwOutlineTabDialog::Ok()
return RET_OK;
}
-SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SW_RES(TP_OUTLINE_NUM), rSet),
- aLevelFL( this, SW_RES(FL_LEVEL )),
- aLevelLB( this, SW_RES(LB_LEVEL )),
- aNumberFL(this, SW_RES(FL_NUMBER)),
- aCollLbl(this, SW_RES(FT_COLL)),
- aCollBox(this, SW_RES(LB_COLL)),
- aNumberLbl(this, SW_RES(FT_NUMBER)),
- aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES),
- aCharFmtFT(this, SW_RES(FT_CHARFMT)),
- aCharFmtLB(this, SW_RES(LB_CHARFMT)),
- aAllLevelFT( this, SW_RES(FT_ALL_LEVEL)),
- aAllLevelNF( this, SW_RES(NF_ALL_LEVEL)),
- aDelim(this, SW_RES(FT_DELIM)),
- aPrefixFT(this, SW_RES(FT_PREFIX)),
- aPrefixED(this, SW_RES(ED_PREFIX)),
- aSuffixFT(this, SW_RES(FT_SUFFIX)),
- aSuffixED(this, SW_RES(ED_SUFFIX)),
- aStartLbl(this, SW_RES(FT_START)),
- aStartEdit(this, SW_RES(ED_START)),
- aPreviewWIN( this, SW_RES(WIN_PREVIEW )),
-
- aNoFmtName(SW_RES(ST_NO_COLL)),
- pSh(0),
- pCollNames(0),
- nActLevel(1)
+SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent,
+ const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "OutlineNumberingPage",
+ "modules/swriter/ui/outlinenumberingpage.ui", rSet)
+ , aNoFmtName(SW_RES(STR_NO_COLL))
+ , pSh(0)
+ , pCollNames(0)
+ , nActLevel(1)
{
- FreeResource();
- SetExchangeSupport();
+ get(m_pLevelLB, "level");
+ get(m_pCollBox, "style");
+ get(m_pNumberBox, "numbering");
+ get(m_pCharFmtLB, "charstyle");
+ get(m_pAllLevelFT, "sublevelsft");
+ get(m_pAllLevelNF, "sublevelsnf");
+ get(m_pPrefixED, "prefix");
+ get(m_pSuffixED, "suffix");
+ get(m_pStartEdit, "startat");
+ get(m_pPreviewWIN, "preview");
- aCollBox.InsertEntry(aNoFmtName);
- aLevelLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl));
- aAllLevelNF.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, ToggleComplete));
- aCollBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect));
- aCollBox.SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus));
- aNumberBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect));
- aPrefixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
- aSuffixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
- aStartEdit.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified));
- aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl));
+ SetExchangeSupport();
+ m_pCollBox->InsertEntry(aNoFmtName);
+ m_pLevelLB->SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl));
+ m_pAllLevelNF->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, ToggleComplete));
+ m_pCollBox->SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect));
+ m_pCollBox->SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus));
+ m_pNumberBox->SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect));
+ m_pPrefixED->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
+ m_pSuffixED->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
+ m_pStartEdit->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified));
+ m_pCharFmtLB->SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl));
}
void SwOutlineSettingsTabPage::Update()
{
// if a template was already selected for this level, select it in the ListBox
- aCollBox.Enable(USHRT_MAX != nActLevel);
+ m_pCollBox->Enable(USHRT_MAX != nActLevel);
if(USHRT_MAX == nActLevel)
{
sal_Bool bSamePrefix = sal_True;
@@ -495,42 +486,42 @@ void SwOutlineSettingsTabPage::Update()
}
CheckForStartValue_Impl(aNumFmtArr[0]->GetNumberingType());
if(bSameType)
- aNumberBox.SelectNumberingType( aNumFmtArr[0]->GetNumberingType() );
+ m_pNumberBox->SelectNumberingType( aNumFmtArr[0]->GetNumberingType() );
else
- aNumberBox.SetNoSelection();
+ m_pNumberBox->SetNoSelection();
if(bSameStart)
- aStartEdit.SetValue(aNumFmtArr[0]->GetStart());
+ m_pStartEdit->SetValue(aNumFmtArr[0]->GetStart());
else
- aStartEdit.SetText(aEmptyStr);
+ m_pStartEdit->SetText(aEmptyStr);
if(bSamePrefix)
- aPrefixED.SetText(aNumFmtArr[0]->GetPrefix());
+ m_pPrefixED->SetText(aNumFmtArr[0]->GetPrefix());
else
- aPrefixED.SetText(aEmptyStr);
+ m_pPrefixED->SetText(aEmptyStr);
if(bSameSuffix)
- aSuffixED.SetText(aNumFmtArr[0]->GetSuffix());
+ m_pSuffixED->SetText(aNumFmtArr[0]->GetSuffix());
else
- aSuffixED.SetText(aEmptyStr);
+ m_pSuffixED->SetText(aEmptyStr);
if(bSameCharFmt)
{
if(pFirstFmt)
- aCharFmtLB.SelectEntry(pFirstFmt->GetName());
+ m_pCharFmtLB->SelectEntry(pFirstFmt->GetName());
else
- aCharFmtLB.SelectEntry( ViewShell::GetShellRes()->aStrNone );
+ m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone );
}
else
- aCharFmtLB.SetNoSelection();
+ m_pCharFmtLB->SetNoSelection();
- aAllLevelFT.Enable(sal_True);
- aAllLevelNF.Enable(sal_True);
- aAllLevelNF.SetMax(MAXLEVEL);
+ m_pAllLevelFT->Enable(sal_True);
+ m_pAllLevelNF->Enable(sal_True);
+ m_pAllLevelNF->SetMax(MAXLEVEL);
if(bSameComplete)
{
- aAllLevelNF.SetValue(aNumFmtArr[0]->GetIncludeUpperLevels());
+ m_pAllLevelNF->SetValue(aNumFmtArr[0]->GetIncludeUpperLevels());
}
else
{
- aAllLevelNF.SetText(aEmptyStr);
+ m_pAllLevelNF->SetText(aEmptyStr);
}
}
else
@@ -538,35 +529,35 @@ void SwOutlineSettingsTabPage::Update()
sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel);
String aColl(pCollNames[nTmpLevel]);
if(aColl.Len())
- aCollBox.SelectEntry(aColl);
+ m_pCollBox->SelectEntry(aColl);
else
- aCollBox.SelectEntry(aNoFmtName);
+ m_pCollBox->SelectEntry(aNoFmtName);
const SwNumFmt &rFmt = pNumRule->Get(nTmpLevel);
- aNumberBox.SelectNumberingType( rFmt.GetNumberingType() );
- aPrefixED.SetText(rFmt.GetPrefix());
- aSuffixED.SetText(rFmt.GetSuffix());
+ m_pNumberBox->SelectNumberingType( rFmt.GetNumberingType() );
+ m_pPrefixED->SetText(rFmt.GetPrefix());
+ m_pSuffixED->SetText(rFmt.GetSuffix());
const SwCharFmt* pFmt = rFmt.GetCharFmt();
if(pFmt)
- aCharFmtLB.SelectEntry(pFmt->GetName());
+ m_pCharFmtLB->SelectEntry(pFmt->GetName());
else
- aCharFmtLB.SelectEntry( ViewShell::GetShellRes()->aStrNone );
+ m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone );
if(nTmpLevel)
{
- aAllLevelFT.Enable(sal_True);
- aAllLevelNF.Enable(sal_True);
- aAllLevelNF.SetMax(nTmpLevel + 1);
- aAllLevelNF.SetValue(rFmt.GetIncludeUpperLevels());
+ m_pAllLevelFT->Enable(sal_True);
+ m_pAllLevelNF->Enable(sal_True);
+ m_pAllLevelNF->SetMax(nTmpLevel + 1);
+ m_pAllLevelNF->SetValue(rFmt.GetIncludeUpperLevels());
}
else
{
- aAllLevelNF.SetText(aEmptyStr);
- aAllLevelNF.Enable(sal_False);
- aAllLevelFT.Enable(sal_False);
+ m_pAllLevelNF->SetText(aEmptyStr);
+ m_pAllLevelNF->Enable(sal_False);
+ m_pAllLevelFT->Enable(sal_False);
}
CheckForStartValue_Impl(rFmt.GetNumberingType());
- aStartEdit.SetValue( rFmt.GetStart() );
+ m_pStartEdit->SetValue( rFmt.GetStart() );
}
SetModified();
}
@@ -687,8 +678,8 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify)
if(nActLevel & nMask)
{
SwNumFmt aNumFmt(pNumRule->Get(i));
- aNumFmt.SetPrefix( aPrefixED.GetText() );
- aNumFmt.SetSuffix( aSuffixED.GetText() );
+ aNumFmt.SetPrefix( m_pPrefixED->GetText() );
+ aNumFmt.SetSuffix( m_pSuffixED->GetText() );
pNumRule->Set(i, aNumFmt);
}
nMask <<= 1;
@@ -716,7 +707,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)
{
- String sEntry = aCharFmtLB.GetSelectEntry();
+ String sEntry = m_pCharFmtLB->GetSelectEntry();
sal_uInt16 nMask = 1;
sal_Bool bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone;
SwCharFmt* pFmt = 0;
@@ -771,25 +762,25 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
pNumRule = ((SwOutlineTabDialog*)GetTabDialog())->GetNumRule();
pCollNames = ((SwOutlineTabDialog*)GetTabDialog())->GetCollNames();
- aPreviewWIN.SetNumRule(pNumRule);
- aPreviewWIN.SetOutlineNames(pCollNames);
+ m_pPreviewWIN->SetNumRule(pNumRule);
+ m_pPreviewWIN->SetOutlineNames(pCollNames);
// set start value - nActLevel must be 1 here
sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel);
const SwNumFmt& rNumFmt = pNumRule->Get( nTmpLevel );
- aStartEdit.SetValue( rNumFmt.GetStart() );
+ m_pStartEdit->SetValue( rNumFmt.GetStart() );
// create pool formats for headlines
String sStr;
sal_uInt16 i;
for( i = 0; i < MAXLEVEL; ++i )
{
- aCollBox.InsertEntry( SwStyleNameMapper::GetUIName(
+ m_pCollBox->InsertEntry( SwStyleNameMapper::GetUIName(
static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyStr ));
- aLevelLB.InsertEntry( String::CreateFromInt32(i + 1) );
+ m_pLevelLB->InsertEntry( String::CreateFromInt32(i + 1) );
}
sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "1 - " ));
sStr += String::CreateFromInt32(MAXLEVEL);
- aLevelLB.InsertEntry( sStr );
+ m_pLevelLB->InsertEntry( sStr );
// query the texttemplates' outlining levels
const sal_uInt16 nCount = pSh->GetTxtFmtCollCount();
@@ -799,26 +790,26 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
if(!rTxtColl.IsDefault())
{
sStr = rTxtColl.GetName();
- if(LISTBOX_ENTRY_NOTFOUND == aCollBox.GetEntryPos( sStr ))
- aCollBox.InsertEntry( sStr );
+ if(LISTBOX_ENTRY_NOTFOUND == m_pCollBox->GetEntryPos( sStr ))
+ m_pCollBox->InsertEntry( sStr );
}
}
- aNumberBox.SelectNumberingType(rNumFmt.GetNumberingType());
+ m_pNumberBox->SelectNumberingType(rNumFmt.GetNumberingType());
sal_uInt16 nOutlinePos = pSh->GetOutlinePos(MAXLEVEL);
sal_uInt16 nTmp = 0;
if(nOutlinePos != USHRT_MAX)
{
nTmp = static_cast<sal_uInt16>(pSh->getIDocumentOutlineNodesAccess()->getOutlineLevel(nOutlinePos));
}
- aLevelLB.SelectEntryPos(nTmp-1);//nTmp);//#outline level,zhaojianwei
+ m_pLevelLB->SelectEntryPos(nTmp-1);//nTmp);//#outline level,zhaojianwei
// collect char styles
- aCharFmtLB.Clear();
- aCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
+ m_pCharFmtLB->Clear();
+ m_pCharFmtLB->InsertEntry( ViewShell::GetShellRes()->aStrNone );
// char styles
- ::FillCharStyleListBox(aCharFmtLB,
+ ::FillCharStyleListBox(*m_pCharFmtLB,
pSh->GetView().GetDocShell());
Update();
}
@@ -827,10 +818,10 @@ void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& )
{
nActLevel = SwOutlineTabDialog::GetActNumLevel();
if(nActLevel != USHRT_MAX)
- aLevelLB.SelectEntryPos(lcl_BitToLevel(nActLevel));
+ m_pLevelLB->SelectEntryPos(lcl_BitToLevel(nActLevel));
else
- aLevelLB.SelectEntryPos(MAXLEVEL);
- LevelHdl(&aLevelLB);
+ m_pLevelLB->SelectEntryPos(MAXLEVEL);
+ LevelHdl(m_pLevelLB);
}
int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*)
@@ -857,13 +848,13 @@ SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent,
void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
{
- sal_Bool bIsNull = aStartEdit.GetValue() == 0;
+ sal_Bool bIsNull = m_pStartEdit->GetValue() == 0;
sal_Bool bNoZeroAllowed = nNumberingType < SVX_NUM_ARABIC ||
SVX_NUM_CHARS_UPPER_LETTER_N == nNumberingType ||
SVX_NUM_CHARS_LOWER_LETTER_N == nNumberingType;
- aStartEdit.SetMin(bNoZeroAllowed ? 1 : 0);
+ m_pStartEdit->SetMin(bNoZeroAllowed ? 1 : 0);
if(bIsNull && bNoZeroAllowed)
- aStartEdit.GetModifyHdl().Call(&aStartEdit);
+ m_pStartEdit->GetModifyHdl().Call(m_pStartEdit);
}
static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc
index df6bee03a960..3c9375bc5f2d 100644
--- a/sw/source/ui/misc/outline.hrc
+++ b/sw/source/ui/misc/outline.hrc
@@ -55,16 +55,4 @@
#define MN_FORM8 118
#define MN_FORM9 119
#define MN_SAVE 120
-
-#define FL_LEVEL 130
-#define LB_LEVEL 131
-#define WIN_PREVIEW 132
-#define FT_SUFFIX 134
-#define ED_SUFFIX 135
-#define FT_PREFIX 136
-#define ED_PREFIX 137
-#define ST_NO_COLL 138
-
-#define ST_FORM 140
-#define FT_CHARFMT 141
-#define LB_CHARFMT 142
+#define ST_FORM 121
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index 32e6b84402d1..43e756c36591 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -186,184 +186,3 @@ TabDialog DLG_TAB_OUTLINE
};
};
};
-/**************************************************************************/
-/* */
-/* TabPage */
-/* */
-/**************************************************************************/
-TabPage TP_OUTLINE_NUM
-{
- HelpID = HID_TP_OUTLINE_NUM ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE;
- ListBox LB_LEVEL
- {
- HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 23 , 129 ) ;
- TabStop = TRUE ;
- DropDown = FALSE ;
- Border = TRUE ;
- };
- FixedLine FL_LEVEL
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 32 , 8 ) ;
- Text [ en-US ] = "Level" ;
- };
- FixedText FT_COLL
- {
- Pos = MAP_APPFONT ( 50 , 14 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
- Text [ en-US ] = "~Paragraph Style" ;
- Group = TRUE ;
- Left = TRUE ;
- };
- ListBox LB_COLL
- {
- HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_COLL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 25 ) ;
- Size = MAP_APPFONT ( 120 , 75 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- Sort = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- };
- FixedText FT_NUMBER
- {
- Pos = MAP_APPFONT ( 50 , 43 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Number" ;
- Left = TRUE ;
- };
- ListBox LB_NUMBER
- {
- HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER";
- Pos = MAP_APPFONT ( 104 , 41 ) ;
- Size = MAP_APPFONT ( 66 , 65 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- };
- FixedText FT_CHARFMT
- {
- Pos = MAP_APPFONT ( 50 , 59 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Character Style" ;
- };
- ListBox LB_CHARFMT
- {
- HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT";
- TabStop = TRUE ;
- DropDown = TRUE ;
- Pos = MAP_APPFONT ( 104 , 57 ) ;
- Size = MAP_APPFONT ( 66 , 65 ) ;
- };
- FixedText FT_ALL_LEVEL
- {
- Pos = MAP_APPFONT ( 50 , 75 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "Sho~w sublevels" ;
- };
- NumericField NF_ALL_LEVEL
- {
- HelpID = "sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 104 , 73 ) ;
- Size = MAP_APPFONT ( 66 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 10 ;
- Value = 1 ;
- First = 1 ;
- Last = 10 ;
- };
- FixedText FT_DELIM
- {
- Pos = MAP_APPFONT ( 50 , 89 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "Separator" ;
- Left = TRUE ;
- };
- FixedText FT_PREFIX
- {
- Pos = MAP_APPFONT ( 56 , 102 ) ;
- Size = MAP_APPFONT ( 46 , 8 ) ;
- Text [ en-US ] = "~Before" ;
- Left = TRUE ;
- };
- Edit ED_PREFIX
- {
- HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_PREFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 104 , 100 ) ;
- Size = MAP_APPFONT ( 66 , 12 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- Left = TRUE ;
- };
- FixedText FT_SUFFIX
- {
- Pos = MAP_APPFONT ( 56 , 117 ) ;
- Size = MAP_APPFONT ( 46 , 8 ) ;
- Text [ en-US ] = "~After" ;
- Left = TRUE ;
- };
- Edit ED_SUFFIX
- {
- HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 104 , 115 ) ;
- Size = MAP_APPFONT ( 66 , 12 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- Left = TRUE ;
- };
- FixedText FT_START
- {
- Pos = MAP_APPFONT ( 50 , 133 ) ;
- Size = MAP_APPFONT ( 52 , 8 ) ;
- Text [ en-US ] = "~Start at" ;
- Left = TRUE ;
- };
- NumericField ED_START
- {
- HelpID = "sw:NumericField:TP_OUTLINE_NUM:ED_START";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 104 , 131 ) ;
- Size = MAP_APPFONT ( 66 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Spin = TRUE ;
- Repeat = TRUE ;
- Maximum = 999 ;
- Value = 0 ;
- First = 0 ;
- Last = 99 ;
- SpinSize = 1 ;
- };
- FixedLine FL_NUMBER
- {
- Pos = MAP_APPFONT ( 44 , 3 ) ;
- Size = MAP_APPFONT ( 210 , 8 ) ;
- Text [ en-US ] = "Numbering" ;
- Group = TRUE ;
- };
- Window WIN_PREVIEW
- {
- Pos = MAP_APPFONT ( 179 , 14 ) ;
- Size = MAP_APPFONT ( 72 , 129 ) ;
- };
- String ST_NO_COLL
- {
- Text [ en-US ] = "(none)" ;
- };
-};
-
diff --git a/sw/uiconfig/sw/ui/20876.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 8c2c920bd0e3..fd15817251f1 100644
--- a/sw/uiconfig/sw/ui/20876.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="20876">
+ <object class="GtkBox" id="OutlineNumberingPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTreeView" id="131">
+ <object class="GtkTreeView" id="level">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
@@ -31,7 +31,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="130">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Level</property>
@@ -75,7 +75,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">10</property>
<child>
- <object class="GtkLabel" id="20">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -90,7 +90,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="21">
+ <object class="GtkComboBox" id="style">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -102,7 +102,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="22">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -116,7 +116,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="141">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -130,7 +130,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="108">
+ <object class="GtkLabel" id="sublevelsft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -144,7 +144,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="24">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -158,7 +158,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="23">
+ <object class="swlo:SwNumberingTypeListBox" id="numbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -170,7 +170,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="142">
+ <object class="GtkComboBox" id="charstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -182,7 +182,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="109">
+ <object class="GtkSpinButton" id="sublevelsnf">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -197,7 +197,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="137">
+ <object class="GtkEntry" id="prefix">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -211,7 +211,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="135">
+ <object class="GtkEntry" id="suffix">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -225,7 +225,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="41">
+ <object class="GtkSpinButton" id="startat">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -244,7 +244,7 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
- <object class="GtkLabel" id="136">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -265,7 +265,7 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
- <object class="GtkLabel" id="134">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -281,7 +281,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="40">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -309,7 +309,7 @@
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="132">
+ <object class="swuilo:NumberingPreview" id="preview">
<property name="width_request">150</property>
<property name="height_request">300</property>
<property name="visible">True</property>
@@ -326,7 +326,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="30">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Numbering</property>
diff --git a/sw/uiconfig/swriter/ui/numberingpositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index 11cf1a7f5144..eadf6faf9b0d 100644
--- a/sw/uiconfig/swriter/ui/numberingpositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -12,7 +12,7 @@
<property name="step_increment">0.050000000000000003</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkBox" id="NumberingPositionPage">
+ <object class="GtkBox" id="OutlinePositionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
generated by cgit (git 2.34.1) at 2025-02-03 12:30:46 +0000