diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-07 10:49:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-07 13:47:02 +0100 |
| commit | d913a5a9dfa44bb8061ff194e990c08cc40d7a69 (patch) | |
| tree | 37c44088f47676e52baec75c5854a050b35f8384 /sw | |
| parent | c06267b1056fed5dedac443b706d721620e40da9 (diff) | |
untangle the bFmt == 2 hack
Firstly, IsFormat is unused so there's no "escape" of
bFmt back into the outside world.
Then bFmt has two purposes.
Purpose 1 is 'not be a format dialog, be a format dialog, be a format dialog but hide standard button'
so, lets just add an explicit "Hide standard button" method and call
it in the (apparently) one place where it's necessary.
Purpose 2 is to flag that "BaseFmtHdl" was called from clicking
the "Standard" button at which point its set to 2.
SfxTabDialog::Init_Impl had...
"
// bFmt = temporary Flag passed on in the Constructor(),
// if bFmt == 2, then also sal_True,
// additional suppression of the standard button,
// after the Initializing set to sal_True again
if ( bFmtFlag != 2 )
m_pBaseFmtBtn->Show();
else
bFmtFlag = sal_True;
"
but the variable acted on is bFmtFlag a copy of bFmt, and is never read again
after that line, so setting it to sal_True is meaningless. The comment suggests
that the intent is to reset bFmt to true if it was 2 during initialization,
which fits with the later use of bFmt == 2 to indicate that the standard button was
clicked, i.e. reset bFmt back to its standard value.
So make bFmt a simple toggle of dialog as a format dialog or not, add a way
to remove the standard button and add a second variable to indicate the standard
button got pressed.
Change-Id: I98a441f5f314845abe243e05b6d92fd71d7b0b04
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/misc/num.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index a1499d8c21d7..bfc509bcf697 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -94,7 +94,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, SwNewDBMgr* pDBMgr, sal_Bool bLabel) : SfxTabDialog(pParent, "LabelDialog", - "modules/swriter/ui/labeldialog.ui", &rSet, false) + "modules/swriter/ui/labeldialog.ui", &rSet) , pNewDBMgr(pDBMgr) , pPrtPage(0) , aTypeIds(50, 10) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 011ac07f8b9c..02cf75d6ee06 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -915,7 +915,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rSh) : SfxTabDialog(pParent, "BulletsAndNumberingDialog", "modules/swriter/ui/bulletsandnumbering.ui", - pSwItemSet, sal_False) + pSwItemSet) , rWrtSh(rSh) { GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 1168d3f3e7a1..d317eb3ab14a 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1202,7 +1202,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth) SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&, const SfxItemSet* pItemSet, SwWrtShell* pSh) : SfxTabDialog(0, pParent, "TablePropertiesDialog", - "modules/swriter/ui/tableproperties.ui", pItemSet, 0) + "modules/swriter/ui/tableproperties.ui", pItemSet) , pShell(pSh) , m_nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell())) { |