starmath/inc/utility.hxx | 7 +++---- starmath/source/utility.cxx | 16 ---------------- 2 files changed, 3 insertions(+), 20 deletions(-)
New commits: commit ac8e83cfb41265c6d8a3f05000e2593bc01494e7 Author: Takeshi Abe <[email protected]> Date: Thu Mar 10 15:09:01 2016 +0900 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 <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 1afb773..3576c5f 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 77cc814..00de175 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();
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
