[Libreoffice-commits] core.git: vcl/win

Thomas Arnhold thomas at arnhold.org
Thu Oct 31 19:47:34 CET 2013


 vcl/win/source/app/salinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9a4a84df5406cdcde1f4d23a1cea2b109998f35b
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Oct 31 19:45:02 2013 +0100

    Windows: SHARDAPPIDINFO since 0x0600
    
    This requires at least Windows 7 / Windows Server 2008.
    
    Otherwise it won't compile under WinXP.
    
    http://msdn.microsoft.com/en-us/library/windows/desktop/dd391556
    
    Change-Id: I984e8bc1e9dc80a9c8bf236be9af3cffabcabd05

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 22917e8..cb19f87 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -1044,6 +1044,7 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
 
     if (osl::FileBase::E_None == rc)
     {
+#if WINVER >= 0x0600
         if ( aSalShlData.mbW7 )
         {
             typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR, IBindCtx*, REFIID, void **ppv );
@@ -1102,6 +1103,9 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
                     }
                 }
             }
+#else
+        (void) rDocumentService;
+#endif
         }
         // For whatever reason, we could not use the SHARD_APPIDINFO semantics
         SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr());


More information about the Libreoffice-commits mailing list