[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx |    3 +--
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx     |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit fbf1963d94c7585df944784bd485901dcdb75acf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun May 8 00:57:55 2016 +0200

    Remove useless typedef DescriptorContainer
    
    Change-Id: Ie5463de6946d1682e28ff8359c3274980af8a1da
    Reviewed-on: https://gerrit.libreoffice.org/24736
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 8f22b6b..5b54f9c 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -210,8 +210,7 @@ private:
     css::uno::Reference<css::container::XIndexAccess> mxSlides;
     PageKind mePageKind;
     EditMode meEditMode;
-    typedef ::std::vector<SharedPageDescriptor> DescriptorContainer;
-    mutable DescriptorContainer maPageDescriptors;
+    mutable ::std::vector<SharedPageDescriptor> maPageDescriptors;
 
     /** Resize the descriptor container according to current values of
         page kind and edit mode.
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 4d9ddfa..6baca00 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -312,14 +312,14 @@ void SlideSorterModel::Resync()
 
 void SlideSorterModel::ClearDescriptorList()
 {
-    DescriptorContainer aDescriptors;
+    ::std::vector<SharedPageDescriptor> aDescriptors;
 
     {
         ::osl::MutexGuard aGuard (maMutex);
         aDescriptors.swap(maPageDescriptors);
     }
 
-    for (DescriptorContainer::iterator iDescriptor=aDescriptors.begin(), iEnd=aDescriptors.end();
+    for (::std::vector<SharedPageDescriptor>::iterator iDescriptor=aDescriptors.begin(), iEnd=aDescriptors.end();
          iDescriptor!=iEnd;
          ++iDescriptor)
     {