Kaydet (Commit) 59329066 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) David Tardon

fdo#75757: remove inheritance to std::vector

... for PaneStyleContainer and ViewStyleContainer.

Change-Id: I6a6e2b1733266f54a94a49ab491cf854eb5df492
Reviewed-on: https://gerrit.libreoffice.org/10847Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst c6de012a
...@@ -142,8 +142,11 @@ public: ...@@ -142,8 +142,11 @@ public:
typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle; typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle;
class PaneStyleContainer : vector<SharedPaneStyle> class PaneStyleContainer
{ {
private:
::std::vector<SharedPaneStyle> mStyles;
public: public:
void Read ( void Read (
ReadContext& rReadContext, ReadContext& rReadContext,
...@@ -179,8 +182,11 @@ public: ...@@ -179,8 +182,11 @@ public:
typedef ::boost::shared_ptr<ViewStyle> SharedViewStyle; typedef ::boost::shared_ptr<ViewStyle> SharedViewStyle;
class ViewStyleContainer : vector<SharedViewStyle> class ViewStyleContainer
{ {
private:
::std::vector<SharedViewStyle> mStyles;
public: public:
void Read ( void Read (
ReadContext& rReadContext, ReadContext& rReadContext,
...@@ -882,8 +888,8 @@ void PaneStyleContainer::ProcessPaneStyle( ...@@ -882,8 +888,8 @@ void PaneStyleContainer::ProcessPaneStyle(
if (rValues[1] >>= sParentStyleName) if (rValues[1] >>= sParentStyleName)
{ {
// Find parent style. // Find parent style.
PaneStyleContainer::const_iterator iStyle; ::std::vector<SharedPaneStyle>::const_iterator iStyle;
for (iStyle=begin(); iStyle!=end(); ++iStyle) for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
if ((*iStyle)->msStyleName.equals(sParentStyleName)) if ((*iStyle)->msStyleName.equals(sParentStyleName))
{ {
pStyle->mpParentStyle = *iStyle; pStyle->mpParentStyle = *iStyle;
...@@ -919,13 +925,13 @@ void PaneStyleContainer::ProcessPaneStyle( ...@@ -919,13 +925,13 @@ void PaneStyleContainer::ProcessPaneStyle(
rReadContext.mxPresenterHelper)); rReadContext.mxPresenterHelper));
} }
push_back(pStyle); mStyles.push_back(pStyle);
} }
SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) const SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) const
{ {
const_iterator iEnd (end()); ::std::vector<SharedPaneStyle>::const_iterator iEnd (mStyles.end());
for (const_iterator iStyle=begin(); iStyle!=iEnd; ++iStyle) for (::std::vector<SharedPaneStyle>::const_iterator iStyle=mStyles.begin(); iStyle!=iEnd; ++iStyle)
if ((*iStyle)->msStyleName == rsStyleName) if ((*iStyle)->msStyleName == rsStyleName)
return *iStyle; return *iStyle;
return SharedPaneStyle(); return SharedPaneStyle();
...@@ -1008,8 +1014,8 @@ void ViewStyleContainer::ProcessViewStyle( ...@@ -1008,8 +1014,8 @@ void ViewStyleContainer::ProcessViewStyle(
>>= sParentStyleName) >>= sParentStyleName)
{ {
// Find parent style. // Find parent style.
ViewStyleContainer::const_iterator iStyle; ::std::vector<SharedViewStyle>::const_iterator iStyle;
for (iStyle=begin(); iStyle!=end(); ++iStyle) for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
if ((*iStyle)->msStyleName.equals(sParentStyleName)) if ((*iStyle)->msStyleName.equals(sParentStyleName))
{ {
pStyle->mpParentStyle = *iStyle; pStyle->mpParentStyle = *iStyle;
...@@ -1039,13 +1045,13 @@ void ViewStyleContainer::ProcessViewStyle( ...@@ -1039,13 +1045,13 @@ void ViewStyleContainer::ProcessViewStyle(
if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is()) if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is())
pStyle->mpBackground = pBackground; pStyle->mpBackground = pBackground;
push_back(pStyle); mStyles.push_back(pStyle);
} }
SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) const SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) const
{ {
const_iterator iEnd (end()); ::std::vector<SharedViewStyle>::const_iterator iEnd (mStyles.end());
for (const_iterator iStyle=begin(); iStyle!=iEnd; ++iStyle) for (::std::vector<SharedViewStyle>::const_iterator iStyle=mStyles.begin(); iStyle!=iEnd; ++iStyle)
if ((*iStyle)->msStyleName == rsStyleName) if ((*iStyle)->msStyleName == rsStyleName)
return *iStyle; return *iStyle;
return SharedViewStyle(); return SharedViewStyle();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment