sw/source/ui/index/cnttab.cxx | 106 ++++++++++++++++++------------------
sw/source/ui/misc/outline.cxx | 70 +++++++++++------------
sw/source/ui/table/splittbl.cxx | 4 -
sw/source/uibase/inc/outline.hxx | 14 ++--
sw/source/uibase/inc/splittbl.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 26 ++++----
6 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit 82c6e059c2ad864c943087704fd95fa72fc2d949
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 10 08:56:38 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 10 11:55:35 2022 +0200
sw: prefix members of SwOutlineTabDialog, SwSplitTableDlg, ...
... SwTOXEntryTabPage and SwTOXSelectTabPage
See tdf#94879 for motivation.
Change-Id: Iecc48926c7c8dbde8a87c991edc717d04cc19332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141150
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 37c5438d83b7..588acbc48f3e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -749,7 +749,7 @@ void SwAddStylesDlg_Impl::ToggleOn(int nEntry, int
nToggleColumn)
SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rAttrSet)
: SfxTabPage(pPage, pController, "modules/swriter/ui/tocindexpage.ui",
"TocIndexPage", &rAttrSet)
- , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
+ , m_sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
, m_bWaitingInitialSettings(true)
, m_xTitleED(m_xBuilder->weld_entry("title"))
, m_xTypeFT(m_xBuilder->weld_label("typeft"))
@@ -794,8 +794,8 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container*
pPage, weld::DialogContr
, m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
, m_xSortAlgorithmLB(m_xBuilder->weld_combo_box("keytype"))
{
- sAddStyleUser = m_xStylesCB->get_label();
- pIndexEntryWrapper.reset(new IndexEntrySupplierWrapper());
+ m_sAddStyleUser = m_xStylesCB->get_label();
+ m_pIndexEntryWrapper.reset(new IndexEntrySupplierWrapper());
m_xLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL |
SvxLanguageListFlags::ONLY_KNOWN,
false );
@@ -806,7 +806,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container*
pPage, weld::DialogContr
Size aPrefSize(m_xContainer->get_preferred_size());
m_xContainer->set_size_request(aPrefSize.Width(), aPrefSize.Height());
- sAddStyleContent = m_xAddStylesCB->get_label();
+ m_sAddStyleContent = m_xAddStylesCB->get_label();
m_xFromObjCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -856,8 +856,8 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container*
pPage, weld::DialogContr
SwTOXSelectTabPage::~SwTOXSelectTabPage()
{
- pIndexRes.reset();
- pIndexEntryWrapper.reset();
+ m_pIndexRes.reset();
+ m_pIndexEntryWrapper.reset();
m_xLanguageLB.reset();
}
@@ -989,7 +989,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
if(TOX_CONTENT == aCurType.eType)
{
m_xFromHeadingsCB->set_active( bool(nCreateType &
SwTOXElement::OutlineLevel) );
- m_xAddStylesCB->set_label(sAddStyleContent);
+ m_xAddStylesCB->set_label(m_sAddStyleContent);
m_xAddStylesPB->set_sensitive(m_xAddStylesCB->get_active());
}
//index only
@@ -1043,7 +1043,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
m_xAutoMarkPB->set_sensitive(m_xFromFileCB->get_active());
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
- aStyleArr[i] = rDesc.GetStyleNames(i);
+ m_aStyleArr[i] = rDesc.GetStyleNames(i);
m_xLanguageLB->set_active_id(rDesc.GetLanguage());
LanguageHdl(nullptr);
@@ -1107,7 +1107,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
if(m_xKeyAsEntryCB->get_active())
nIndexOptions |= SwTOIOptions::KeyAsEntry;
if(m_xFromFileCB->get_active())
- rDesc.SetAutoMarkURL(sAutoMarkURL);
+ rDesc.SetAutoMarkURL(m_sAutoMarkURL);
else
rDesc.SetAutoMarkURL(OUString());
}
@@ -1162,7 +1162,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
rDesc.SetReadonly(m_xReadOnlyCB->get_active());
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
- rDesc.SetStyleNames(aStyleArr[i], i);
+ rDesc.SetStyleNames(m_aStyleArr[i], i);
rDesc.SetLanguage(m_xLanguageLB->get_active_id());
const OUString& rEntryData = m_xSortAlgorithmLB->get_active_id();
@@ -1177,9 +1177,9 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* )
sal_uInt32 nData = lcl_TOXTypesToUserData(aCurType);
m_xTypeLB->set_active_id(OUString::number(nData));
- sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),
+ m_sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),
INetURLObject::DecodeMechanism::Unambiguous );
- m_xFromFileCB->set_active(!sAutoMarkURL.isEmpty());
+ m_xFromFileCB->set_active(!m_sAutoMarkURL.isEmpty());
m_xCaptionSequenceLB->clear();
const size_t nCount = rSh.GetFieldTypeCount(SwFieldIds::SetExp);
@@ -1276,7 +1276,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,
weld::ComboBox&, rBox, void)
}
else if( nType & TO_USER )
{
- m_xAddStylesCB->set_label(sAddStyleUser);
+ m_xAddStylesCB->set_label(m_sAddStyleUser);
}
m_xIdxOptionsFrame->set_visible( 0 != (nType & TO_INDEX) );
@@ -1362,10 +1362,10 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageListBoxHdl,
weld::ComboBox&, rBox, void)
void SwTOXSelectTabPage::LanguageHdl(const weld::ComboBox* pBox)
{
lang::Locale aLcl( LanguageTag( m_xLanguageLB->get_active_id()
).getLocale() );
- Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
+ Sequence< OUString > aSeq = m_pIndexEntryWrapper->GetAlgorithmList( aLcl );
- if( !pIndexRes )
- pIndexRes.reset(new IndexEntryResource());
+ if( !m_pIndexRes )
+ m_pIndexRes.reset(new IndexEntryResource());
OUString sOldString = m_xSortAlgorithmLB->get_active_id();
m_xSortAlgorithmLB->clear();
@@ -1374,7 +1374,7 @@ void SwTOXSelectTabPage::LanguageHdl(const
weld::ComboBox* pBox)
for( sal_Int32 nCnt = 0; nCnt < nEnd; ++nCnt )
{
const OUString sAlg(aSeq[ nCnt ]);
- const OUString sUINm = pIndexRes->GetTranslation( sAlg );
+ const OUString sUINm = m_pIndexRes->GetTranslation( sAlg );
m_xSortAlgorithmLB->append(sAlg, sUINm);
if( sAlg == sOldString )
m_xSortAlgorithmLB->set_active(nCnt);
@@ -1390,39 +1390,39 @@ void SwTOXSelectTabPage::LanguageHdl(const
weld::ComboBox* pBox)
IMPL_LINK_NOARG(SwTOXSelectTabPage, AddStylesHdl, weld::Button&, void)
{
SwAddStylesDlg_Impl aDlg(GetFrameWeld(),
static_cast<SwMultiTOXTabDialog*>(GetDialogController())->GetWrtShell(),
- aStyleArr);
+ m_aStyleArr);
aDlg.run();
ModifyHdl();
}
IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::Toggleable&, void)
{
- m_xAutoMarkPB->set_item_sensitive("edit", !sAutoMarkURL.isEmpty());
+ m_xAutoMarkPB->set_item_sensitive("edit", !m_sAutoMarkURL.isEmpty());
}
IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OString&, rIdent, void)
{
- const OUString sSaveAutoMarkURL = sAutoMarkURL;
+ const OUString sSaveAutoMarkURL = m_sAutoMarkURL;
if (rIdent == "open")
{
- sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(),
- sAutoMarkURL, sAutoMarkType, true);
+ m_sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(),
+ m_sAutoMarkURL, m_sAutoMarkType, true);
}
else if (rIdent == "new" || rIdent == "edit")
{
bool bNew = (rIdent == "new");
if (bNew)
{
- sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(),
- sAutoMarkURL, sAutoMarkType, false);
- if (sAutoMarkURL.isEmpty())
+ m_sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(),
+ m_sAutoMarkURL, m_sAutoMarkType, false);
+ if (m_sAutoMarkURL.isEmpty())
return;
}
- SwAutoMarkDlg_Impl aAutoMarkDlg(GetFrameWeld(), sAutoMarkURL, bNew);
+ SwAutoMarkDlg_Impl aAutoMarkDlg(GetFrameWeld(), m_sAutoMarkURL, bNew);
if (RET_OK != aAutoMarkDlg.run() && bNew)
- sAutoMarkURL = sSaveAutoMarkURL;
+ m_sAutoMarkURL = sSaveAutoMarkURL;
}
}
@@ -1830,10 +1830,10 @@ namespace
SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rAttrSet)
: SfxTabPage(pPage, pController, "modules/swriter/ui/tocentriespage.ui",
"TocEntriesPage", &rAttrSet)
- , sDelimStr(SwResId(STR_DELIM))
- , sNoCharStyle(SwResId(STR_NO_CHAR_STYLE))
+ , m_sDelimStr(SwResId(STR_DELIM))
+ , m_sNoCharStyle(SwResId(STR_NO_CHAR_STYLE))
, m_pCurrentForm(nullptr)
- , bInLevelHdl(false)
+ , m_bInLevelHdl(false)
, m_xTypeFT(m_xBuilder->weld_label("typeft"))
, m_xLevelFT(m_xBuilder->weld_label("levelft"))
, m_xLevelLB(m_xBuilder->weld_tree_view("level"))
@@ -1884,13 +1884,13 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container*
pPage, weld::DialogControl
{
const OUString sNoCharSortKey(SwResId(STR_NOSORTKEY));
- sAuthTypeStr = m_xTypeFT->get_label();
- sLevelStr = m_xLevelFT->get_label();
+ m_sAuthTypeStr = m_xTypeFT->get_label();
+ m_sLevelStr = m_xLevelFT->get_label();
m_xAuthFieldsLB->make_sorted();
m_xTokenWIN->SetTabPage(this);
- aLastTOXType.eType = TOXTypes(USHRT_MAX);
- aLastTOXType.nIndex = 0;
+ m_aLastTOXType.eType = TOXTypes(USHRT_MAX);
+ m_aLastTOXType.nIndex = 0;
SetExchangeSupport();
m_xEntryNoPB->connect_clicked(LINK(this, SwTOXEntryTabPage,
InsertTokenHdl));
@@ -1904,7 +1904,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container*
pPage, weld::DialogControl
m_xTokenWIN->SetButtonSelectedHdl(LINK(this, SwTOXEntryTabPage,
TokenSelectedHdl));
m_xTokenWIN->SetModifyHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl));
m_xCharStyleLB->connect_changed(LINK(this, SwTOXEntryTabPage,
StyleSelectHdl));
- m_xCharStyleLB->append_text(sNoCharStyle);
+ m_xCharStyleLB->append_text(m_sNoCharStyle);
m_xChapterEntryLB->connect_changed(LINK(this, SwTOXEntryTabPage,
ChapterInfoHdl));
m_xEntryOutlineLevelNF->connect_value_changed(LINK(this,
SwTOXEntryTabPage, ChapterInfoOutlineHdl));
m_xNumberFormatLB->connect_changed(LINK(this, SwTOXEntryTabPage,
NumberFormatHdl));
@@ -2026,7 +2026,7 @@ void SwTOXEntryTabPage::OnModify(bool bAllLevels)
if (pTOXDlg)
{
sal_uInt16 nCurLevel = m_xLevelLB->get_selected_index() + 1;
- if (aLastTOXType.eType == TOX_CONTENT && bAllLevels)
+ if (m_aLastTOXType.eType == TOX_CONTENT && bAllLevels)
nCurLevel = USHRT_MAX;
pTOXDlg->CreateOrUpdateExample(
pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_ENTRY, nCurLevel);
@@ -2055,7 +2055,7 @@ void SwTOXEntryTabPage::Reset( const SfxItemSet* )
m_xMainEntryStyleLB->set_active_text(sMainEntryCharStyle);
}
else
- m_xMainEntryStyleLB->set_active_text(sNoCharStyle);
+ m_xMainEntryStyleLB->set_active_text(m_sNoCharStyle);
m_xAlphaDelimCB->set_active( bool(rDesc.GetIndexOptions() &
SwTOIOptions::AlphaDelimiter) );
}
m_xRelToStyleCB->set_active(m_pCurrentForm->IsRelTabPos());
@@ -2101,7 +2101,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet&
/*rSet*/)
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
m_pCurrentForm = pTOXDlg->GetForm(aCurType);
- if( !( aLastTOXType == aCurType ))
+ if( !( m_aLastTOXType == aCurType ))
{
bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
bool bToxIsIndex = TOX_INDEX == aCurType.eType;
@@ -2115,7 +2115,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet&
/*rSet*/)
else if( bToxIsIndex )
{
if(i == 1)
- m_xLevelLB->append_text( sDelimStr );
+ m_xLevelLB->append_text( m_sDelimStr );
else
m_xLevelLB->append_text( OUString::number(i - 1) );
}
@@ -2159,17 +2159,17 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet&
/*rSet*/)
}
}
SortKeyHdl(m_xSortDocPosRB->get_active() ? *m_xSortDocPosRB :
*m_xSortContentRB);
- m_xLevelFT->set_label(sAuthTypeStr);
+ m_xLevelFT->set_label(m_sAuthTypeStr);
}
else
- m_xLevelFT->set_label(sLevelStr);
+ m_xLevelFT->set_label(m_sLevelStr);
m_xLevelLB->select(bToxIsIndex ? 1 : 0);
//show or hide controls
ShowHideControls(aCurType.eType);
}
- aLastTOXType = aCurType;
+ m_aLastTOXType = aCurType;
//invalidate PatternWindow
m_xTokenWIN->SetInvalid();
@@ -2180,17 +2180,17 @@ void SwTOXEntryTabPage::UpdateDescriptor()
{
WriteBackLevel();
SwMultiTOXTabDialog* pTOXDlg =
static_cast<SwMultiTOXTabDialog*>(GetDialogController());
- SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aLastTOXType);
- if(TOX_INDEX == aLastTOXType.eType)
+ SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(m_aLastTOXType);
+ if(TOX_INDEX == m_aLastTOXType.eType)
{
const OUString sTemp(m_xMainEntryStyleLB->get_active_text());
- rDesc.SetMainEntryCharStyle(sNoCharStyle == sTemp ? OUString(): sTemp);
+ rDesc.SetMainEntryCharStyle(m_sNoCharStyle == sTemp ? OUString():
sTemp);
SwTOIOptions nIdxOptions = rDesc.GetIndexOptions() &
~SwTOIOptions::AlphaDelimiter;
if (m_xAlphaDelimCB->get_active())
nIdxOptions |= SwTOIOptions::AlphaDelimiter;
rDesc.SetIndexOptions(nIdxOptions);
}
- else if (TOX_AUTHORITIES == aLastTOXType.eType)
+ else if (TOX_AUTHORITIES == m_aLastTOXType.eType)
{
rDesc.SetSortByDocument(m_xSortDocPosRB->get_active());
SwTOXSortKey aKey1, aKey2, aKey3;
@@ -2203,7 +2203,7 @@ void SwTOXEntryTabPage::UpdateDescriptor()
rDesc.SetSortKeys(aKey1, aKey2, aKey3);
}
- SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType);
+ SwForm* pCurrentForm = pTOXDlg->GetForm(m_aLastTOXType);
if (m_xRelToStyleCB->get_visible())
pCurrentForm->SetRelTabPos(m_xRelToStyleCB->get_active());
if (m_xCommaSeparatedCB->get_visible())
@@ -2349,9 +2349,9 @@ void SwTOXEntryTabPage::WriteBackLevel()
IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::TreeView&, rBox, void)
{
- if(bInLevelHdl)
+ if(m_bInLevelHdl)
return;
- bInLevelHdl = true;
+ m_bInLevelHdl = true;
WriteBackLevel();
const sal_uInt16 nLevel = rBox.get_selected_index();
@@ -2380,7 +2380,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::TreeView&,
rBox, void)
}
m_xAuthFieldsLB->set_active(0);
}
- bInLevelHdl = false;
+ m_bInLevelHdl = false;
rBox.grab_focus();
}
@@ -2395,10 +2395,10 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl,
SwFormToken&, rToken, void)
if (!rToken.sCharStyleName.isEmpty())
m_xCharStyleLB->set_active_text(rToken.sCharStyleName);
else
- m_xCharStyleLB->set_active_text(sNoCharStyle);
+ m_xCharStyleLB->set_active_text(m_sNoCharStyle);
const OUString sEntry = m_xCharStyleLB->get_active_text();
- m_xEditStylePB->set_sensitive(sEntry != sNoCharStyle);
+ m_xEditStylePB->set_sensitive(sEntry != m_sNoCharStyle);
if(rToken.eTokenType == TOKEN_CHAPTER_INFO)
{
@@ -2507,7 +2507,7 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl,
weld::ComboBox&, rBox, void)
{
OUString sEntry = rBox.get_active_text();
const sal_uInt16 nId = rBox.get_active_id().toUInt32();
- const bool bEqualsNoCharStyle = sEntry == sNoCharStyle;
+ const bool bEqualsNoCharStyle = sEntry == m_sNoCharStyle;
m_xEditStylePB->set_sensitive(!bEqualsNoCharStyle);
if (bEqualsNoCharStyle)
sEntry.clear();
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 7dda513c872a..4e80a92af200 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -141,15 +141,15 @@ sal_uInt16 SwOutlineTabDialog::nNumLevel = 1;
SwOutlineTabDialog::SwOutlineTabDialog(weld::Window* pParent, const
SfxItemSet* pSwItemSet,
SwWrtShell &rSh)
: SfxTabDialogController(pParent,
"modules/swriter/ui/outlinenumbering.ui", "OutlineNumberingDialog", pSwItemSet)
- , rWrtSh(rSh)
- , pChapterNumRules(SW_MOD()->GetChapterNumRules())
- , bModified(rWrtSh.IsModified())
+ , m_rWrtSh(rSh)
+ , m_pChapterNumRules(SW_MOD()->GetChapterNumRules())
+ , m_bModified(m_rWrtSh.IsModified())
, m_xMenuButton(m_xBuilder->weld_menu_button("format"))
{
m_xMenuButton->connect_toggled(LINK(this, SwOutlineTabDialog, FormHdl));
m_xMenuButton->connect_selected(LINK(this, SwOutlineTabDialog,
MenuSelectHdl));
- xNumRule.reset(new SwNumRule(*rSh.GetOutlineNumRule()));
+ m_xNumRule.reset(new SwNumRule(*rSh.GetOutlineNumRule()));
GetCancelButton().connect_clicked(LINK(this, SwOutlineTabDialog,
CancelHdl));
AddTabPage("position", &SwNumPositionTabPage::Create, nullptr);
@@ -161,23 +161,23 @@ SwOutlineTabDialog::SwOutlineTabDialog(weld::Window*
pParent, const SfxItemSet*
for( i = 0; i < MAXLEVEL; ++i )
{
// if the style wasn't created yet, it's still at this position
- if( !rWrtSh.GetParaStyle( sHeadline =
+ if( !m_rWrtSh.GetParaStyle( sHeadline =
SwStyleNameMapper::GetUIName( static_cast< sal_uInt16
>(RES_POOLCOLL_HEADLINE1 + i),
sHeadline )) )
- aCollNames[i] = sHeadline;
+ m_aCollNames[i] = sHeadline;
}
// query the text templates' outlining levels
- const sal_uInt16 nCount = rWrtSh.GetTextFormatCollCount();
+ const sal_uInt16 nCount = m_rWrtSh.GetTextFormatCollCount();
for(i = 0; i < nCount; ++i )
{
- SwTextFormatColl &rTextColl = rWrtSh.GetTextFormatColl(i);
+ SwTextFormatColl &rTextColl = m_rWrtSh.GetTextFormatColl(i);
if(!rTextColl.IsDefault())
{
if(rTextColl.IsAssignedToListLevelOfOutlineStyle())
{
int nOutLevel = rTextColl.GetAssignedOutlineStyleLevel();
- aCollNames[ nOutLevel ] = rTextColl.GetName();
+ m_aCollNames[ nOutLevel ] = rTextColl.GetName();
}
}
}
@@ -191,19 +191,19 @@ void SwOutlineTabDialog::PageCreated(const OString&
rPageId, SfxTabPage& rPage)
{
if (rPageId == "position")
{
- static_cast<SwNumPositionTabPage&>(rPage).SetWrtShell(&rWrtSh);
+ static_cast<SwNumPositionTabPage&>(rPage).SetWrtShell(&m_rWrtSh);
static_cast<SwNumPositionTabPage&>(rPage).SetOutlineTabDialog(this);
}
else if (rPageId == "numbering")
{
- static_cast<SwOutlineSettingsTabPage&>(rPage).SetWrtShell(&rWrtSh);
+ static_cast<SwOutlineSettingsTabPage&>(rPage).SetWrtShell(&m_rWrtSh);
}
}
IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl, weld::Button&, void)
{
- if (!bModified)
- rWrtSh.ResetModified();
+ if (!m_bModified)
+ m_rWrtSh.ResetModified();
m_xDialog->response(RET_CANCEL);
}
@@ -215,7 +215,7 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl,
weld::Toggleable&, void)
// fill PopupMenu
for(sal_uInt16 i = 0; i < SwChapterNumRules::nMaxRules; ++i)
{
- const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(i);
+ const SwNumRulesWithName *pRules = m_pChapterNumRules->GetRules(i);
if (!pRules)
continue;
m_xMenuButton->set_item_label("form" + OString::number(i + 1),
pRules->GetName());
@@ -250,7 +250,7 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const
OString&, rIdent, void)
const OUString *aStrArr[SwChapterNumRules::nMaxRules];
for(sal_uInt16 i = 0; i < SwChapterNumRules::nMaxRules; ++i)
{
- const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(i);
+ const SwNumRulesWithName *pRules = m_pChapterNumRules->GetRules(i);
if(pRules)
aStrArr[i] = &pRules->GetName();
else
@@ -260,8 +260,8 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const
OString&, rIdent, void)
if (aDlg.run() == RET_OK)
{
const OUString aName(aDlg.GetName());
- pChapterNumRules->ApplyNumRules( SwNumRulesWithName(
- *xNumRule, aName ), aDlg.GetCurEntryPos() );
+ m_pChapterNumRules->ApplyNumRules( SwNumRulesWithName(
+ *m_xNumRule, aName ), aDlg.GetCurEntryPos() );
m_xMenuButton->set_item_label("form" +
OString::number(aDlg.GetCurEntryPos() + 1), aName);
}
return;
@@ -269,17 +269,17 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const
OString&, rIdent, void)
if( nLevelNo-- )
{
- const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(
nLevelNo );
+ const SwNumRulesWithName *pRules = m_pChapterNumRules->GetRules(
nLevelNo );
if( pRules )
{
- pRules->ResetNumRule(rWrtSh, *xNumRule);
- xNumRule->SetRuleType( OUTLINE_RULE );
+ pRules->ResetNumRule(m_rWrtSh, *m_xNumRule);
+ m_xNumRule->SetRuleType( OUTLINE_RULE );
SfxTabPage* pOutlinePage = GetTabPage("numbering");
assert(pOutlinePage);
-
static_cast<SwOutlineSettingsTabPage*>(pOutlinePage)->SetNumRule(xNumRule.get());
+
static_cast<SwOutlineSettingsTabPage*>(pOutlinePage)->SetNumRule(m_xNumRule.get());
}
else
- *xNumRule = *rWrtSh.GetOutlineNumRule();
+ *m_xNumRule = *m_rWrtSh.GetOutlineNumRule();
}
SfxTabPage* pPage = GetCurTabPage();
@@ -290,7 +290,7 @@ sal_uInt16
SwOutlineTabDialog::GetLevel(std::u16string_view rFormatName) const
{
for(sal_uInt16 i = 0; i < MAXLEVEL; ++i)
{
- if(aCollNames[i] == rFormatName)
+ if(m_aCollNames[i] == rFormatName)
return i;
}
return MAXLEVEL;
@@ -304,14 +304,14 @@ short SwOutlineTabDialog::Ok()
// encapsulate changes into an action to avoid effects on the current
cursor
// position during the changes.
- rWrtSh.StartAction();
+ m_rWrtSh.StartAction();
- const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule();
+ const SwNumRule * pOutlineRule = m_rWrtSh.GetOutlineNumRule();
- sal_uInt16 i, nCount = rWrtSh.GetTextFormatCollCount();
+ sal_uInt16 i, nCount = m_rWrtSh.GetTextFormatCollCount();
for( i = 0; i < nCount; ++i )
{
- SwTextFormatColl &rTextColl = rWrtSh.GetTextFormatColl(i);
+ SwTextFormatColl &rTextColl = m_rWrtSh.GetTextFormatColl(i);
if( !rTextColl.IsDefault() )
{
const SfxPoolItem & rItem =
@@ -348,18 +348,18 @@ short SwOutlineTabDialog::Ok()
OUString sHeadline;
::SwStyleNameMapper::FillUIName( static_cast< sal_uInt16
>(RES_POOLCOLL_HEADLINE1 + i),
sHeadline );
- SwTextFormatColl* pColl = rWrtSh.FindTextFormatCollByName( sHeadline );
- if( !pColl && aCollNames[i] != sHeadline)
+ SwTextFormatColl* pColl = m_rWrtSh.FindTextFormatCollByName( sHeadline
);
+ if( !pColl && m_aCollNames[i] != sHeadline)
{
- SwTextFormatColl* pTextColl = rWrtSh.GetTextCollFromPool(
+ SwTextFormatColl* pTextColl = m_rWrtSh.GetTextCollFromPool(
static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i) );
pTextColl->DeleteAssignmentToListLevelOfOutlineStyle();
pTextColl->ResetFormatAttr(RES_PARATR_NUMRULE);
- if( !aCollNames[i].isEmpty() )
+ if( !m_aCollNames[i].isEmpty() )
{
- pTextColl = rWrtSh.GetParaStyle(
- aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
+ pTextColl = m_rWrtSh.GetParaStyle(
+ m_aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
if(pTextColl)
{
pTextColl->AssignToListLevelOfOutlineStyle(i);
@@ -370,10 +370,10 @@ short SwOutlineTabDialog::Ok()
}
}
- rWrtSh.SetOutlineNumRule(*xNumRule);
+ m_rWrtSh.SetOutlineNumRule(*m_xNumRule);
// #i30443#
- rWrtSh.EndAction();
+ m_rWrtSh.EndAction();
return RET_OK;
}
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index 0deb5d03093c..a255b5f76afc 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -27,7 +27,7 @@ SwSplitTableDlg::SwSplitTableDlg(weld::Window* pParent,
SwWrtShell& rSh)
,
m_xBoxAttrCopyWithParaRB(m_xBuilder->weld_radio_button("customheadingapplystyle"))
, m_xBoxAttrCopyNoParaRB(m_xBuilder->weld_radio_button("customheading"))
, m_xBorderCopyRB(m_xBuilder->weld_radio_button("noheading"))
- , rShell(rSh)
+ , m_rShell(rSh)
, m_nSplit(SplitTable_HeadlineOption::ContentCopy)
{
}
@@ -42,7 +42,7 @@ void SwSplitTableDlg::Apply()
else if (m_xBorderCopyRB->get_active())
m_nSplit = SplitTable_HeadlineOption::BorderCopy;
- rShell.SplitTable(m_nSplit);
+ m_rShell.SplitTable(m_nSplit);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 1b1d76ccccd9..8e948c8de95b 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -34,13 +34,13 @@ class SwOutlineTabDialog final : public
SfxTabDialogController
{
static sal_uInt16 nNumLevel;
- OUString aCollNames[MAXLEVEL];
+ OUString m_aCollNames[MAXLEVEL];
- SwWrtShell& rWrtSh;
- std::unique_ptr<SwNumRule> xNumRule;
- SwChapterNumRules* pChapterNumRules;
+ SwWrtShell& m_rWrtSh;
+ std::unique_ptr<SwNumRule> m_xNumRule;
+ SwChapterNumRules* m_pChapterNumRules;
- bool bModified : 1;
+ bool m_bModified : 1;
std::unique_ptr<weld::MenuButton> m_xMenuButton;
@@ -55,9 +55,9 @@ public:
SwOutlineTabDialog(weld::Window* pParent, const SfxItemSet* pSwItemSet,
SwWrtShell &);
virtual ~SwOutlineTabDialog() override;
- SwNumRule* GetNumRule() { return xNumRule.get(); }
+ SwNumRule* GetNumRule() { return m_xNumRule.get(); }
sal_uInt16 GetLevel(std::u16string_view rFormatName) const;
- OUString* GetCollNames() {return aCollNames;}
+ OUString* GetCollNames() {return m_aCollNames;}
static sal_uInt16 GetActNumLevel() {return nNumLevel;}
static void SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;}
diff --git a/sw/source/uibase/inc/splittbl.hxx
b/sw/source/uibase/inc/splittbl.hxx
index 99e61f7d4075..8c8891c1df1b 100644
--- a/sw/source/uibase/inc/splittbl.hxx
+++ b/sw/source/uibase/inc/splittbl.hxx
@@ -33,7 +33,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xBoxAttrCopyNoParaRB;
std::unique_ptr<weld::RadioButton> m_xBorderCopyRB;
- SwWrtShell& rShell;
+ SwWrtShell& m_rShell;
SplitTable_HeadlineOption m_nSplit;
void Apply();
diff --git a/sw/source/uibase/inc/swuicnttab.hxx
b/sw/source/uibase/inc/swuicnttab.hxx
index 359e58dc62eb..12f3888e2980 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -117,15 +117,15 @@ public:
class SwTOXSelectTabPage final : public SfxTabPage
{
- std::unique_ptr<IndexEntryResource> pIndexRes;
+ std::unique_ptr<IndexEntryResource> m_pIndexRes;
- OUString aStyleArr[MAXLEVEL];
- OUString sAutoMarkURL;
- OUString sAutoMarkType;
- OUString sAddStyleUser;
- OUString sAddStyleContent;
+ OUString m_aStyleArr[MAXLEVEL];
+ OUString m_sAutoMarkURL;
+ OUString m_sAutoMarkType;
+ OUString m_sAddStyleUser;
+ OUString m_sAddStyleContent;
- std::unique_ptr<const IndexEntrySupplierWrapper> pIndexEntryWrapper;
+ std::unique_ptr<const IndexEntrySupplierWrapper> m_pIndexEntryWrapper;
bool m_bWaitingInitialSettings;
@@ -304,15 +304,15 @@ private:
class SwTOXEntryTabPage final : public SfxTabPage
{
- OUString sDelimStr;
- OUString sLevelStr;
- OUString sAuthTypeStr;
+ OUString m_sDelimStr;
+ OUString m_sLevelStr;
+ OUString m_sAuthTypeStr;
- OUString sNoCharStyle;
+ OUString m_sNoCharStyle;
SwForm* m_pCurrentForm;
- CurTOXType aLastTOXType;
- bool bInLevelHdl;
+ CurTOXType m_aLastTOXType;
+ bool m_bInLevelHdl;
std::unique_ptr<weld::Label> m_xTypeFT;
std::unique_ptr<weld::Label> m_xLevelFT;
