[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source

[Armin Le Grand]

 svtools/source/graphic/grfmgr2.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit a48414a396f7de4e00510e82e3744c097ce3d5d6
Author: Armin Le Grand <alg at apache.org>
Date:   Thu Jun 19 20:12:25 2014 +0000

    corrected place for stl sort function for linux

diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index c8532bb..5cac068 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -295,6 +295,17 @@ ByteString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const
 
 // -----------------------------------------------------------------------------
 
+namespace
+{
+    struct simpleSortByDataChangeTimeStamp
+    {
+        bool operator() (GraphicObject* p1, GraphicObject* p2) const
+        {
+            return p1->GetDataChangeTimeStamp() < p2->GetDataChangeTimeStamp();
+        }
+    };
+} // end of anonymous namespace
+
 void GraphicManager::ImplCheckSizeOfSwappedInGraphics()
 {
     // only necessary for 32bit systems
@@ -334,14 +345,6 @@ void GraphicManager::ImplCheckSizeOfSwappedInGraphics()
         if(nUsedSize >= nMaxCacheSize && !aCandidates.empty())
         {
             // if we use more currently, sort by last DataChangeTimeStamp
-            struct simpleSortByDataChangeTimeStamp
-            {
-                bool operator() (GraphicObject* p1, GraphicObject* p2) const
-                {
-                    return p1->GetDataChangeTimeStamp() < p2->GetDataChangeTimeStamp();
-                }
-            };
-
             // sort by DataChangeTimeStamp so that the oldest get removed first
             ::std::sort(aCandidates.begin(), aCandidates.end(), simpleSortByDataChangeTimeStamp());