diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-23 10:06:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-23 17:27:30 +0200 |
| commit | 32a10a772d07fc12e5b1332925b8d53c7ab8e928 (patch) | |
| tree | ef4503df2fecd131fc3b91c4f651179fdb351329 | |
| parent | 024b7a23ec854155047ea234911bffa99457694a (diff) | |
move GetConfigId from TabPage to SfxTabPage
Change-Id: Id2c687c2270cb1c2419cc6664200292b2740d0a4
Reviewed-on: https://gerrit.libreoffice.org/53325
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/tabpage.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/tabpage.cxx | 8 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index f171de346dce..e288e07cd8f7 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -302,6 +302,8 @@ public: void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); css::uno::Reference< css::frame::XFrame > GetFrame(); + + OString GetConfigId() const; }; #endif diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index a837ee2761e4..3845da4fffed 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -52,8 +52,6 @@ public: virtual void ActivatePage(); virtual void DeactivatePage(); - OString GetConfigId() const; - //To-Do, consider inheriting from VclContainer virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override; virtual void SetPosPixel(const Point& rNewPos) override; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index c63a62e3fdc5..ff5c508efdf9 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -312,6 +312,13 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const return dynamic_cast<SfxTabDialog*>(GetParentDialog()); } +OString SfxTabPage::GetConfigId() const +{ + OString sId(GetHelpId()); + if (sId.isEmpty() && isLayoutEnabled(this)) + sId = GetWindow(GetWindowType::FirstChild)->GetHelpId(); + return sId; +} SfxTabDialog::SfxTabDialog diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index f44385002574..a9d44ffa20e1 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -181,14 +181,6 @@ void TabPage::DeactivatePage() { } -OString TabPage::GetConfigId() const -{ - OString sId(GetHelpId()); - if (sId.isEmpty() && isLayoutEnabled(this)) - sId = GetWindow(GetWindowType::FirstChild)->GetHelpId(); - return sId; -} - Size TabPage::GetOptimalSize() const { if (isLayoutEnabled(this)) |