[Libreoffice-commits] core.git: sfx2/source

[Matteo Casalin]

 sfx2/source/dialog/filedlghelper.cxx |    6 ++----
 sfx2/source/dialog/filedlgimpl.hxx   |    2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0ff696769088c2da896130dc722662b39a4416e4
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sun Mar 5 21:39:06 2017 +0100

    No need to keep these booleans as data members
    
    Change-Id: Id56cb074a3b62423769afc3c4a3ab2f7a312f1be
    Reviewed-on: https://gerrit.libreoffice.org/35284
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b6ff97b0a99d..9a90ade8693a 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -886,12 +886,10 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
     mbHasVersions           = false;
     mbHasPreview            = false;
     mbShowPreview           = false;
-    mbAddGraphicFilter      = bool(nFlags & FileDialogFlags::Graphic);
     mbDeleteMatcher         = false;
     mbInsert                = bool(nFlags & FileDialogFlags::Insert);
     mbExport                = bool(nFlags & FileDialogFlags::Export);
     mbIsSaveDlg             = false;
-    mbIsSaveACopyDlg        = bool(nFlags & FileDialogFlags::SaveACopy);
     mbPwdCheckBoxState      = false;
     mbSelection             = false;
     mbSelectionEnabled      = true;
@@ -1083,7 +1081,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
     if ( nFlags & FileDialogFlags::MultiSelection )
         mxFileDlg->setMultiSelectionMode( true );
 
-    if (mbAddGraphicFilter) // generate graphic filter only on demand
+    if ( nFlags & FileDialogFlags::Graphic ) // generate graphic filter only on demand
     {
         addGraphicFilter();
     }
@@ -1100,7 +1098,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
     }
 
     // Save a copy dialog
-    if ( mbIsSaveACopyDlg )
+    if ( nFlags & FileDialogFlags::SaveACopy )
     {
         mxFileDlg->setTitle( SfxResId( STR_PB_SAVEACOPY ).toString() );
     }
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index db6782a94f41..1ea707989463 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -81,11 +81,9 @@ namespace sfx2
         bool                    m_bHaveFilterOptions    : 1;
         bool                    mbHasVersions           : 1;
         bool                    mbHasAutoExt            : 1;
-        bool                    mbAddGraphicFilter      : 1;
         bool                    mbHasPreview            : 1;
         bool                    mbShowPreview           : 1;
         bool                    mbIsSaveDlg             : 1;
-        bool                    mbIsSaveACopyDlg        : 1;
         bool                    mbExport                : 1;
 
         bool                    mbDeleteMatcher         : 1;