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 /filter | |
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 'filter')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index b80d9d5da1e1..dbe76bd0583b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -62,9 +62,7 @@ using namespace ::com::sun::star; ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rxDoc) - : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui", - 0, false), - + : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui"), maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ), maConfigI18N( "Office.Common/I18N/CTL/" ), mnSigningPageId(0), |