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

[Takeshi Abe]

 shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5673bac9a7403d19bafbb28f2608be7f38dbb4df
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Feb 25 16:53:01 2014 +0900

    Revert partially "Replace deprecated std::auto_ptr with boost::scoped_ptr"
    
    This reverts partially commit 4a9347fa320d892b60fd03082925f63a1d69cfb9.
    
    Change-Id: Ibbc626f8d30de040fe9e809b44d5ffc9513720fb

diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index ea02c7d..45918f5 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -43,7 +43,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 extern HINSTANCE g_hModule;
 
@@ -357,7 +357,7 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage)
     try
     {
         std::wstring fname = getShortPathName( filename_ );
-        boost::scoped_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );
+        std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );
 
         if (zipfile->HasContent(THUMBNAIL_CONTENT))
         {