tdf#141011: Postpone SwFieldDBPage::Reset to tab activation

This way, it will only ask for password when dialog is switched to that tab.

Change-Id: Ie2a453b0b6867ceb1ef3728a8565de4f6cbf4757
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112469
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 6f71e91fea88..47fa332390db 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -169,6 +169,8 @@ void SfxTabPage::Reset( const SfxItemSet* )
 {
 }
 
+bool SfxTabPage::DeferResetToFirstActivation() { return false; }
+
 void SfxTabPage::ActivatePage( const SfxItemSet& )
 /*  [Description]
 
@@ -920,7 +922,10 @@ void SfxTabDialogController::CreatePages()
         pDataObject->xTabPage->SetUserData(sUserData);
 
         PageCreated(pDataObject->sId, *pDataObject->xTabPage);
-        pDataObject->xTabPage->Reset(m_pSet.get());
+        if (pDataObject->xTabPage->DeferResetToFirstActivation())
+            pDataObject->bRefresh = true; // Reset will be called in ActivatePageHdl
+        else
+            pDataObject->xTabPage->Reset(m_pSet.get());
     }
 }