mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Windows: SHARDAPPIDINFO since 0x0600"

Browse Source 
This reverts commit 9a4a84df54

This was false, because WINVER is currently set to 0x0500 in
solenv/gbuild/platform/windows.mk. We need a runtime check like it's
realised already and have to define the missing struct if necessary.

Change-Id: I267dff1c8137657e47bdc4ad5ae81d511d7b9d5f
This commit is contained in:
Thomas Arnhold
2013-11-05 01:20:24 +01:00
parent 2fb0b401ae
commit e52294558b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/win/source/app/salinst.cxx
View File

@@ -1044,7 +1044,6 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
if (osl::FileBase::E_None == rc) if (osl::FileBase::E_None == rc)
{ {
#if WINVER >= 0x0600
if ( aSalShlData.mbW7 ) if ( aSalShlData.mbW7 )
{ {
typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR, IBindCtx*, REFIID, void **ppv ); typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR, IBindCtx*, REFIID, void **ppv );
@@ -1104,9 +1103,6 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
} }
} }
} }
#else
(void) rDocumentService;
#endif
// For whatever reason, we could not use the SHARD_APPIDINFO semantics // For whatever reason, we could not use the SHARD_APPIDINFO semantics
SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr()); SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr());
} }