diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-03-10 15:09:01 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 15:24:10 +0000 |
| commit | ac8e83cfb41265c6d8a3f05000e2593bc01494e7 (patch) | |
| tree | 94f29c5837df9ef84a909e043a59153990e352a7 /starmath | |
| parent | 21b92f386c32defa498284df752d909c9555c4c1 (diff) | |
starmath: no need to override SmFontPickList::Update/Remove
Just use them instead.
Change-Id: Ic82d2c3edc1d0ccd2551f8cf208f108168148786
Reviewed-on: https://gerrit.libreoffice.org/23111
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/utility.hxx | 7 | ||||
| -rw-r--r-- | starmath/source/utility.cxx | 16 |
2 files changed, 3 insertions, 20 deletions
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 1afb773bfde0..3576c5fe1faf 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -124,8 +124,8 @@ public: virtual ~SmFontPickList() { Clear(); } virtual void Insert(const vcl::Font &rFont); - virtual void Update(const vcl::Font &rFont, const vcl::Font &rNewFont); - virtual void Remove(const vcl::Font &rFont); + void Update(const vcl::Font &rFont, const vcl::Font &rNewFont); + void Remove(const vcl::Font &rFont); void Clear(); vcl::Font Get(sal_uInt16 nPos = 0) const; @@ -152,8 +152,7 @@ public: virtual void Insert(const vcl::Font &rFont) override; using Window::Update; - virtual void Update(const vcl::Font &rFont, const vcl::Font &rNewFont) override; - virtual void Remove(const vcl::Font &rFont) override; + using SmFontPickList::Update; }; #endif diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 77cc81478660..00de175fcbb3 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -194,22 +194,6 @@ void SmFontPickListBox::Insert(const vcl::Font &rFont) } -void SmFontPickListBox::Update(const vcl::Font &rFont, const vcl::Font &rNewFont) -{ - SmFontPickList::Update(rFont, rNewFont); - - return; -} - - -void SmFontPickListBox::Remove(const vcl::Font &rFont) -{ - SmFontPickList::Remove(rFont); - - return; -} - - bool IsItalic( const vcl::Font &rFont ) { FontItalic eItalic = rFont.GetItalic(); |