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

[Stephan Bergmann]

 fpicker/source/win32/folderpicker/MtaFop.cxx |    6 +--
 fpicker/source/win32/folderpicker/MtaFop.hxx |   44 ---------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

New commits:
commit 5b37ec6eb19ec2bd5020b54197cd554f1b645a4f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 26 19:05:38 2017 +0100

    loplugin:useuniqueptr
    
    CMtaFolderPicker resp. its only derived class CWinFolderPickerImpl is only ever
    instantiated on the heap, so no harm in having that array directly as a member.
    
    Change-Id: I23312e34d3377a46b95a7ee059a2dbbf8f937422

diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 595711e..3bd3f51 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -367,7 +367,7 @@ bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
     // pre SHBrowseFroFolder
 
     m_bi.pidlRoot       = nullptr;
-    m_bi.pszDisplayName = reinterpret_cast<LPWSTR>(m_pathBuff.get());
+    m_bi.pszDisplayName = reinterpret_cast<LPWSTR>(m_pathBuff);
 
     if ( m_Description.getLength( ) )
         m_bi.lpszTitle = reinterpret_cast<LPCWSTR>(m_Description.getStr( ));
@@ -428,9 +428,9 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI
 
     if ( lpItemIdList )
     {
-        bool bRet = SHGetPathFromIDListW( lpItemIdList, reinterpret_cast<LPWSTR>(m_pathBuff.get()) );
+        bool bRet = SHGetPathFromIDListW( lpItemIdList, reinterpret_cast<LPWSTR>(m_pathBuff) );
         if ( bRet )
-            path = m_pathBuff.get( );
+            path = m_pathBuff;
     }
 
     return path;
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 8853076..6f9eeea 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -43,48 +43,6 @@
 #endif
 #include "../misc/WinImplHelper.hxx"
 
-
-// a simple helper class used to provide a buffer for different
-// Win32 file and directory functions
-
-
-class CAutoPathBuff
-{
-public:
-    explicit CAutoPathBuff( size_t size = 0 )
-    {
-        if (0 == size)
-            size = 32000; // max path length under Win2000
-
-        pBuff = new sal_Unicode[size];
-
-        SAL_WARN_IF(!pBuff, "fpicker", "Could not allocate path buffer");
-    }
-
-    ~CAutoPathBuff( )
-    {
-        delete [] pBuff;
-    }
-
-    operator sal_Unicode*( )
-    {
-        OSL_PRECOND( pBuff,
-            "No path buffer allocated" );
-        return pBuff;
-    }
-
-    sal_Unicode* get( )
-    {
-        OSL_PRECOND( pBuff,
-            "No path buffer allocated" );
-        return pBuff;
-    }
-
-private:
-    sal_Unicode* pBuff;
-};
-
-
 // the Mta-Ole clipboard class is for internal use only!
 // only one instance of this class should be created, the
 // user has to ensure this!
@@ -168,7 +126,7 @@ private:
     OUString               m_displayDir;
     OUString               m_SelectedDir;
     BROWSEINFOW                 m_bi;
-    CAutoPathBuff               m_pathBuff;
+    sal_Unicode                 m_pathBuff[32000]; // max path length under Win2000
     HINSTANCE                   m_hInstance;
 
     // the request window class has to be registered only