From e8d1504ba7299d78dd825a512e8f04ef33900997 Mon Sep 17 00:00:00 2001 From: Tamás Zolnai Date: Wed, 10 Feb 2021 11:04:25 +0100 Subject: Dropdown form field: don't increase code compexity for gen backend. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's just an internal thing, we don't really need to optimize the code for it. This HideButton() function is not use anywhere else. Change-Id: I2e5fff73f6d50a0dedbd8d5f7eea748d09de6330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110709 Tested-by: Tamás Zolnai Reviewed-by: Tamás Zolnai --- sw/source/core/crsr/bookmrk.cxx | 12 ------------ sw/source/core/inc/bookmrk.hxx | 2 -- sw/source/uibase/shells/textsh1.cxx | 4 ---- 3 files changed, 18 deletions(-) (limited to 'sw') diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 097e2dea6bd2..472c0af54557 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -611,12 +611,6 @@ namespace sw { namespace mark m_pButton.disposeAndClear(); } - void FieldmarkWithDropDownButton::HideButton() - { - if(m_pButton) - m_pButton->Show(false); - } - void FieldmarkWithDropDownButton::RemoveButton() { if(m_pButton) @@ -645,12 +639,6 @@ namespace sw { namespace mark } } - void DropDownFieldmark::HideButton() - { - SendLOKMessage("hide"); - FieldmarkWithDropDownButton::HideButton(); - } - void DropDownFieldmark::RemoveButton() { SendLOKMessage("hide"); diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index f0f81bf32c3c..2fe0cf3a0d5e 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -278,7 +278,6 @@ namespace sw { virtual ~FieldmarkWithDropDownButton() override; virtual void ShowButton(SwEditWin* pEditWin) = 0; - virtual void HideButton(); virtual void RemoveButton(); protected: @@ -294,7 +293,6 @@ namespace sw { virtual ~DropDownFieldmark() override; virtual void ShowButton(SwEditWin* pEditWin) override; - virtual void HideButton() override; virtual void RemoveButton() override; // This method should be called only by the portion so we can now the portion's painting area diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 298c6ed4a2c9..44fa64318acb 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1418,8 +1418,6 @@ void SwTextShell::Execute(SfxRequest &rReq) pFieldBM->Invalidate(); rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() ); rWrtSh.UpdateCursor(); // cursor position might be invalid - // Hide the button here and make it visible later, to make transparent background work with SAL_USE_VCLPLUGIN=gen - dynamic_cast<::sw::mark::DropDownFieldmark&>(*pFieldBM).HideButton(); } } else if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDATE ) @@ -1432,8 +1430,6 @@ void SwTextShell::Execute(SfxRequest &rReq) rDateField.Invalidate(); rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() ); rWrtSh.UpdateCursor(); // cursor position might be invalid - // Hide the button here and make it visible later, to make transparent background work with SAL_USE_VCLPLUGIN=gen - rDateField.HideButton(); } } else -- cgit