summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-03-20 11:56:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-03-22 14:21:02 +0100
commitfbd79c6125fd302dde9af2d76171dd5ca794af4d (patch)
treedc5b94523c89d892c07544368643bad2eea4c3af /include
parent7d0bd54bad1782f74c156aa667e875c33efee0c1 (diff)
weld SwFieldDlg
Change-Id: I324a581721e01c907113bb3ab1cc91a290bd71a7 Reviewed-on: https://gerrit.libreoffice.org/69475 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/tabdlg.hxx2
-rw-r--r--include/vcl/abstdlg.hxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index e2395fd4fe1f..3b858cf4a7f5 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -223,6 +223,7 @@ private:
protected:
virtual short Ok();
virtual void RefreshInputSet();
+ virtual SfxItemSet* CreateInputItemSet(const OString& rName);
virtual void PageCreated(const OString &rName, SfxTabPage &rPage);
std::unique_ptr<SfxItemSet> m_xExampleSet;
@@ -261,6 +262,7 @@ public:
void RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui
void SetCurPageId(const OString& rName);
+ void ShowPage(const OString& rName); // SetCurPageId + call Activate on it
OString GetCurPageId() const;
SfxTabPage* GetCurTabPage() const { return GetTabPage(GetCurPageId()); }
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 71369c92057b..4e9f72d218a3 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -62,7 +62,7 @@ public:
// for the case where the dialog is welded, and is running async without a DialogController
std::shared_ptr<weld::Dialog> mxOwnerSelf;
std::function<void(sal_Int32)> maEndDialogFn;
- bool isSet() { return !!maEndDialogFn; }
+ bool isSet() const { return !!maEndDialogFn; }
};
bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn)