[Libreoffice-commits] core.git: vcl/inc

[Takeshi Abe]

 vcl/inc/graphite_layout.hxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit bad30ceceee6750b6ece0057080473383d216ea7
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Sep 19 16:32:23 2014 +0900

    fdo#75757: remove inheritance to std::vector
    
    Glyphs::iterator_pair_t was gone at df3c7e76cca60d246277731d0c525d5f7e6f6597.
    
    Change-Id: I471a2ef659dd98527d2dca5fd8c3741851341ec5
    Reviewed-on: https://gerrit.libreoffice.org/11533
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 3295468..7356bd5 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -87,13 +87,7 @@ private:
 class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout
 {
 public:
-
-    class Glyphs : public std::vector<GlyphItem>
-    {
-    public:
-        typedef std::pair<Glyphs::const_iterator, Glyphs::const_iterator> iterator_pair_t;
-
-    };
+    typedef std::vector<GlyphItem> Glyphs;
 
     mutable Glyphs          mvGlyphs;
     void clear();