diff options
| author | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2023-11-10 12:00:46 +0100 |
|---|---|---|
| committer | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2023-11-10 16:59:29 +0100 |
| commit | bb79936ec808712f53bc48663a485875571ba643 (patch) | |
| tree | 8bd8c114bb41cc68fb966d12ee0edd728e03151a /sc/source/ui/miscdlgs/mvtabdlg.cxx | |
| parent | e890b0f0a90316b69f49e0e9d3cb2b1b4528084a (diff) | |
tdf#96854 - De-static-ize last used option for copy/move sheet
Change-Id: Iafb12b51f166f9485f1658c406a98e5db5b246ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159292
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Diffstat (limited to 'sc/source/ui/miscdlgs/mvtabdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/mvtabdlg.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 12c4e4d54bcc..afacdc48b46e 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -26,9 +26,7 @@ #include <scresid.hxx> #include <comphelper/lok.hxx> #include <utility> - -// tdf#96854 - remember last used option for copy/move sheet -bool ScMoveTableDlg::mbRememeberedCopy = false; +#include <tabvwsh.hxx> ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, OUString aDefault) : GenericDialogController(pParent, "modules/scalc/ui/movecopysheet.ui", "MoveCopySheetDialog") @@ -193,8 +191,11 @@ void ScMoveTableDlg::Init() m_xEdTabName->connect_changed(LINK(this, ScMoveTableDlg, CheckNameHdl)); // tdf#96854 - remember last used option for copy/move sheet - m_xBtnMove->set_active(!mbRememeberedCopy); - m_xBtnCopy->set_active(mbRememeberedCopy); + const bool bIsCopyActive + = ScTabViewShell::GetActiveViewShell()->GetViewData().GetOptions().GetOption( + VOPT_COPY_SHEET); + m_xBtnMove->set_active(!bIsCopyActive); + m_xBtnCopy->set_active(bIsCopyActive); m_xEdTabName->set_sensitive(false); m_xFtWarn->hide(); InitDocListBox(); @@ -250,7 +251,10 @@ void ScMoveTableDlg::SetOkBtnLabel() // tdf#139464 Write "Copy" or "Move" on OK button m_xBtnOk->set_label(bIsCopyActive ? m_xBtnCopy->get_label() : m_xBtnMove->get_label()); // tdf#96854 - remember last used option for copy/move sheet - mbRememeberedCopy = bIsCopyActive; + ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); + ScViewOptions aViewOpt(pScViewShell->GetViewData().GetOptions()); + aViewOpt.SetOption(VOPT_COPY_SHEET, bIsCopyActive); + pScViewShell->GetViewData().SetOptions(aViewOpt); } // Handler: |