diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-20 10:20:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-20 13:39:08 +0200 |
| commit | 56775815a39c2ee4a0f711738947d2fb234c4923 (patch) | |
| tree | e11780c6736e32518950102ceb73103fabaeb576 /svx | |
| parent | fe851316be45b891468fdab4d8b8f23fdf869e5e (diff) | |
loplugin:constantparam
Change-Id: Ia58d8950b3b9e48bbe9f075b9fe1eed62d9abf0d
Reviewed-on: https://gerrit.libreoffice.org/53188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/passwd.cxx | 13 | ||||
| -rw-r--r-- | svx/source/gallery2/galmisc.cxx | 3 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 45b6a1f284fb..2a66b031bec4 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -57,23 +57,14 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, weld::Button&, void) IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, weld::Entry&, void) { - if (!m_bEmpty) - { - OUString aPasswd = comphelper::string::strip(m_xRepeatPasswdED->get_text(), ' '); - if (aPasswd.isEmpty() && m_xOKBtn->get_sensitive()) - m_xOKBtn->set_sensitive(false); - else if (!aPasswd.isEmpty() && !m_xOKBtn->get_sensitive()) - m_xOKBtn->set_sensitive(true); - } - else if (!m_xOKBtn->get_sensitive()) + if (!m_xOKBtn->get_sensitive()) m_xOKBtn->set_sensitive(true); } -SvxPasswordDialog::SvxPasswordDialog(weld::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) +SvxPasswordDialog::SvxPasswordDialog(weld::Window* pParent, bool bDisableOldPassword) : GenericDialogController(pParent, "svx/ui/passwd.ui", "PasswordDialog") , m_aOldPasswdErrStr(SvxResId(RID_SVXSTR_ERR_OLD_PASSWD)) , m_aRepeatPasswdErrStr(SvxResId(RID_SVXSTR_ERR_REPEAT_PASSWD )) - , m_bEmpty(bAllowEmptyPasswords) , m_xOldFL(m_xBuilder->weld_label("oldpass")) , m_xOldPasswdFT(m_xBuilder->weld_label("oldpassL")) , m_xOldPasswdED(m_xBuilder->weld_entry("oldpassEntry")) diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 147a0551a54b..6469a4a5bea9 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -65,7 +65,7 @@ BitmapEx GalleryResGetBitmapEx(const OUString &rId) } GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, - OUString& rFilterName, bool bShowProgress ) + OUString& rFilterName ) { GalleryGraphicImportRet nRet = GalleryGraphicImportRet::IMPORT_NONE; SfxMedium aMedium( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ); @@ -77,7 +77,6 @@ GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic if( pIStm ) { GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); - std::unique_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : nullptr); sal_uInt16 nFormat; if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 2bd3be8f315e..1d0760fcf516 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -781,7 +781,7 @@ bool GalleryTheme::GetGraphic(sal_uInt32 nPos, Graphic& rGraphic) case SgaObjKind::Inet: { OUString aFilterDummy; - bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, /*bProgress*/false ) != GalleryGraphicImportRet::IMPORT_NONE ); + bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy ) != GalleryGraphicImportRet::IMPORT_NONE ); } break; |