Author: alg
Date: Thu Jun 19 20:12:25 2014
New Revision: 1604028
URL: http://svn.apache.org/r1604028
Log:
corrected place for stl sort function for linux
Modified:
openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx
Modified: openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx?rev=1604028&r1=1604027&r2=1604028&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx (original)
+++ openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx Thu Jun 19
20:12:25 2014
@@ -295,6 +295,17 @@ ByteString GraphicManager::ImplGetUnique
//
-----------------------------------------------------------------------------
+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::ImplCheckSizeOfSwap
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());