diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-15 15:27:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-18 10:05:31 +0200 |
| commit | 0693d69d6080b6976133e0e68db2637d0030370d (patch) | |
| tree | baaca2a2f85a7b33d0e9bfc89fd805527542b513 /sc/source/ui/inc | |
| parent | 5889fd4416cd9569c44e2d250ce5d027974bd243 (diff) | |
weld ScCharDlg
Change-Id: Ie0fe76ef5c5c706007c2285b3a309d92ff4bc2b0
Reviewed-on: https://gerrit.libreoffice.org/60528
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/textdlgs.hxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 13ff4590fd6e..2e4fc68ff472 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -24,17 +24,14 @@ class SfxObjectShell; -class ScCharDlg : public SfxTabDialog +class ScCharDlg : public SfxTabDialogController { private: const SfxObjectShell& rDocShell; - sal_uInt16 m_nNamePageId; - sal_uInt16 m_nEffectsPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override; + virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; public: - ScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, - const SfxObjectShell* pDocShell); + ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); }; class ScParagraphDlg : public SfxTabDialog diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 0027a73abae2..4e1c5f46a761 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -360,7 +360,8 @@ public: ScMarkData& GetMarkData(); const ScMarkData& GetMarkData() const; - vcl::Window* GetDialogParent(); // forwarded from tabvwsh + vcl::Window* GetDialogParent(); // forwarded from tabvwsh + weld::Window* GetFrameWeld(); // forwarded from tabvwsh ScGridWindow* GetActiveWin(); // from View const ScGridWindow* GetActiveWin() const; ScDrawView* GetScDrawView(); // from View |