summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-09-19 16:32:23 +0900
committerCaolán McNamara <caolanm@redhat.com>2014-09-25 08:24:49 +0000
commitbad30ceceee6750b6ece0057080473383d216ea7 (patch)
tree3575c91ad17f5549a25cc67494da4bc0b9f911f7
parentd54a72a40852e206d78ab4c57a6898cfae39b8d0 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/inc/graphite_layout.hxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 32954680d054..7356bd52827a 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();