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(-)
New commits:
commit 1e00ec5b5303bcf3eafd665106ba1e2c0ae8f791
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Wed Feb 10 11:04:25 2021 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Thu Feb 11 13:57:21 2021 +0100
Dropdown form field: don't increase code compexity for gen backend.
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 <tamas.zol...@collabora.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
(cherry picked from commit e8d1504ba7299d78dd825a512e8f04ef33900997)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110758
Tested-by: Jenkins
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 167aaf37f625..5ea199607d5e 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -648,12 +648,6 @@ namespace sw::mark
m_pButton.disposeAndClear();
}
- void FieldmarkWithDropDownButton::HideButton()
- {
- if(m_pButton)
- m_pButton->Show(false);
- }
-
void FieldmarkWithDropDownButton::RemoveButton()
{
if(m_pButton)
@@ -682,12 +676,6 @@ namespace sw::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 63e05befe41b..272667432584 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -273,7 +273,6 @@ namespace sw::mark {
virtual ~FieldmarkWithDropDownButton() override;
virtual void ShowButton(SwEditWin* pEditWin) = 0;
- virtual void HideButton();
virtual void RemoveButton();
protected:
@@ -289,7 +288,6 @@ namespace sw::mark {
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 a65d7ccebf42..c191d4c90f86 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1416,8 +1416,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 )
@@ -1430,8 +1428,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
