sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 32 +++++++++++------------
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2 -
2 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit c35db5ca9d82554149d6a63e159c2da6037fa867
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Sep 17 18:20:42 2014 +0900
Stop using unnecessary std::auto_ptr
No need to allocate mpMasterPages dynamically.
Thanks David Tardon for pointing it out.
Change-Id: Id91ce50b190c7807f4c59d211110c28409c244ca
Reviewed-on: https://gerrit.libreoffice.org/11484
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 591b578..c7e295e 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -90,7 +90,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance
(void)
RecentlyUsedMasterPages::RecentlyUsedMasterPages (void)
: maListeners(),
- mpMasterPages(new MasterPageList()),
+ mvMasterPages(),
mnMaxListSize(8),
mpContainer(new MasterPageContainer())
{
@@ -135,8 +135,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
// Read the names and URLs of the master pages.
Sequence<OUString> aKeys (xSet->getElementNames());
- mpMasterPages->clear();
- mpMasterPages->reserve(aKeys.getLength());
+ mvMasterPages.clear();
+ mvMasterPages.reserve(aKeys.getLength());
for (int i=0; i<aKeys.getLength(); i++)
{
Reference<container::XNameAccess> xSetItem (
@@ -168,7 +168,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
pDescriptor->mpPreviewProvider =
::boost::shared_ptr<PreviewProvider>(
new PagePreviewProvider());
MasterPageContainer::Token aToken
(mpContainer->PutMasterPage(pDescriptor));
- mpMasterPages->push_back(Descriptor(aToken,sURL,sName));
+ mvMasterPages.push_back(Descriptor(aToken,sURL,sName));
}
}
@@ -209,8 +209,8 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
return;
MasterPageList::const_iterator iDescriptor;
sal_Int32 nIndex(0);
- for (iDescriptor=mpMasterPages->begin();
- iDescriptor!=mpMasterPages->end();
+ for (iDescriptor=mvMasterPages.begin();
+ iDescriptor!=mvMasterPages.end();
++iDescriptor,++nIndex)
{
// Create new child.
@@ -261,13 +261,13 @@ void RecentlyUsedMasterPages::RemoveEventListener (const
Link& rEventListener)
int RecentlyUsedMasterPages::GetMasterPageCount (void) const
{
- return mpMasterPages->size();
+ return mvMasterPages.size();
}
MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex
(sal_uInt32 nIndex) const
{
- if(nIndex<mpMasterPages->size())
- return (*mpMasterPages)[nIndex].maToken;
+ if(nIndex<mvMasterPages.size())
+ return mvMasterPages[nIndex].maToken;
else
return MasterPageContainer::NIL_TOKEN;
}
@@ -336,25 +336,25 @@ void RecentlyUsedMasterPages::AddMasterPage (
{
MasterPageList::iterator aIterator (
- ::std::find_if(mpMasterPages->begin(),mpMasterPages->end(),
+ ::std::find_if(mvMasterPages.begin(),mvMasterPages.end(),
Descriptor::TokenComparator(aToken)));
- if (aIterator != mpMasterPages->end())
+ if (aIterator != mvMasterPages.end())
{
// When an entry for the given token already exists then remove
// it now and insert it later at the head of the list.
- mpMasterPages->erase (aIterator);
+ mvMasterPages.erase (aIterator);
}
- mpMasterPages->insert(mpMasterPages->begin(),
+ mvMasterPages.insert(mvMasterPages.begin(),
Descriptor(
aToken,
mpContainer->GetURLForToken(aToken),
mpContainer->GetStyleNameForToken(aToken)));
// Shorten list to maximal size.
- while (mpMasterPages->size() > mnMaxListSize)
+ while (mvMasterPages.size() > mnMaxListSize)
{
- mpMasterPages->pop_back ();
+ mvMasterPages.pop_back ();
}
if (bMakePersistent)
@@ -368,7 +368,7 @@ void RecentlyUsedMasterPages::ResolveList (void)
bool bNotify (false);
MasterPageList::iterator iDescriptor;
- for (iDescriptor=mpMasterPages->begin();
iDescriptor!=mpMasterPages->end(); ++iDescriptor)
+ for (iDescriptor=mvMasterPages.begin(); iDescriptor!=mvMasterPages.end();
++iDescriptor)
{
if (iDescriptor->maToken == MasterPageContainer::NIL_TOKEN)
{
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index aba7fe3..37af4a8 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -87,7 +87,7 @@ private:
::std::vector<Link> maListeners;
typedef ::std::vector<Descriptor> MasterPageList;
- ::std::auto_ptr<MasterPageList> mpMasterPages;
+ MasterPageList mvMasterPages;
unsigned long int mnMaxListSize;
::boost::shared_ptr<MasterPageContainer> mpContainer;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
