diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-08-07 23:35:02 +0900 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-08-07 14:43:58 +0000 |
commit | 38a3d53d8b9e6dd66c19f721be9b4b3e350eb249 (patch) | |
tree | f177da612dbfdc45ce63014981a2542835ec702a /vcl | |
parent | 73a31771ad7775d7900b328967eb2f8628261d64 (diff) |
fdo#75757: remove inheritance to std::vector
Change-Id: I04a5832c86823718146c78238ea648be21bf1f53
Reviewed-on: https://gerrit.libreoffice.org/10811
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index c56339519dc1..11aec8713fc0 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -155,12 +155,16 @@ struct NWFWidgetData // easily and quickly reset each to a default state before using // them static boost::unordered_map<long, guint> gWidgetDefaultFlags; -class WidgetDataVector : public std::vector<NWFWidgetData> +class WidgetDataVector { +private: + std::vector<NWFWidgetData> mData; + public: - WidgetDataVector(size_t nElems = 0) : std::vector<NWFWidgetData>( nElems ) {} - NWFWidgetData &operator [](size_t i) { return at(i); } - NWFWidgetData &operator [](const SalX11Screen &s) { return at(s.getXScreen()); } + WidgetDataVector(size_t nElems = 0) : mData( nElems ) {} + size_t size() const { return mData.size(); } + NWFWidgetData &operator [](size_t i) { return mData.at(i); } + NWFWidgetData &operator [](const SalX11Screen &s) { return mData.at(s.getXScreen()); } }; static WidgetDataVector gWidgetData; |