Kaydet (Commit) 32a10a77 authored tarafından Caolán McNamara's avatar Caolán McNamara

move GetConfigId from TabPage to SfxTabPage

Change-Id: Id2c687c2270cb1c2419cc6664200292b2740d0a4
Reviewed-on: https://gerrit.libreoffice.org/53325Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 024b7a23
...@@ -302,6 +302,8 @@ public: ...@@ -302,6 +302,8 @@ public:
void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
css::uno::Reference< css::frame::XFrame > GetFrame(); css::uno::Reference< css::frame::XFrame > GetFrame();
OString GetConfigId() const;
}; };
#endif #endif
......
...@@ -52,8 +52,6 @@ public: ...@@ -52,8 +52,6 @@ public:
virtual void ActivatePage(); virtual void ActivatePage();
virtual void DeactivatePage(); virtual void DeactivatePage();
OString GetConfigId() const;
//To-Do, consider inheriting from VclContainer //To-Do, consider inheriting from VclContainer
virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override; virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override;
virtual void SetPosPixel(const Point& rNewPos) override; virtual void SetPosPixel(const Point& rNewPos) override;
......
...@@ -312,6 +312,13 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const ...@@ -312,6 +312,13 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const
return dynamic_cast<SfxTabDialog*>(GetParentDialog()); 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 SfxTabDialog::SfxTabDialog
......
...@@ -181,14 +181,6 @@ void TabPage::DeactivatePage() ...@@ -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 Size TabPage::GetOptimalSize() const
{ {
if (isLayoutEnabled(this)) if (isLayoutEnabled(this))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment