[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/uiconfig vcl/inc

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |    8 ++++----
 vcl/inc/glyphcache.hxx                        |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d99603925cb7f4480d55ac96069a29c6869f343f
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Wed Aug 22 17:54:11 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Wed Aug 22 17:54:11 2018 +0000

    Small change to Calc toolbar

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 52fcb4fe0cf1..770e46e5a521 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -41,16 +41,16 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:style="radio auto"/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignVCenter" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio auto"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight"/>
  <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio auto" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVCenter" toolbar:style="radio auto" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio auto" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:visible="false"/>
commit 7b63e739fc22b8ade19cbd6fd5a343d0b457f751
Author:     Don Lewis <truckman at apache.org>
AuthorDate: Wed Aug 22 16:58:51 2018 +0000
Commit:     Don Lewis <truckman at apache.org>
CommitDate: Wed Aug 22 16:58:51 2018 +0000

    Fix RemovingGlyph method parameter type mismatch between the base
    
    and derived classes (int vs sal_GlyphId) and clean up a related
    type mismatch involving this parameter in the base method implementation.

diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index 26b4d5d78a7b..dfe137f98df7 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -221,7 +221,7 @@ protected:
     virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
 
 private:
-    typedef ::std::hash_map<int,GlyphData> GlyphList;
+    typedef ::std::hash_map<sal_GlyphId,GlyphData> GlyphList;
     mutable GlyphList           maGlyphList;
 
     const ImplFontSelectData    maFontSelData;
@@ -304,7 +304,7 @@ protected:
 public:
     sal_Int32       GetByteCount() const { return mnBytesUsed; }
     virtual void    RemovingFont( ServerFont& ) {}
-    virtual void    RemovingGlyph( ServerFont&, GlyphData&, int ) {}
+    virtual void    RemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId ) {}
 
 protected:
     sal_Int32       mnBytesUsed;