Don't attempt to show release notes after installing, fdo#31023

4 files changed, 0 insertions, 268 deletions

diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 7767e773b..76bec6050 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -4,7 +4,6 @@ pk  setup_native\scripts\source                           nmake   -  u   sn_sour
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
 pk  setup_native\source\mac                               nmake   -  u   sn_mac NULL
 pk  setup_native\source\win32\customactions\tools         nmake   -  w   sn_tools NULL
-pk  setup_native\source\win32\customactions\relnotes      nmake   -  w   sn_relnotes NULL
 pk  setup_native\source\win32\customactions\rebase        nmake   -  w   sn_rebase NULL
 pk  setup_native\source\win32\customactions\regactivex    nmake   -  w   sn_regactivex NULL
 pk  setup_native\source\win32\customactions\regpatchactivex nmake -  w   sn_regpatchactivex NULL
diff --git a/setup_native/source/win32/customactions/relnotes/exports.dxp b/setup_native/source/win32/customactions/relnotes/exports.dxp
deleted file mode 100644
index 55a454d3d..000000000
--- a/setup_native/source/win32/customactions/relnotes/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-ShowReleaseNotesBefore
-ShowReleaseNotesAfter
-ShowSurveyAfter
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
deleted file mode 100644
index 526d45e71..000000000
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-PRJNAME=setup_native
-TARGET=relnotes
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-NO_DEFAULT_STL=TRUE
-DYNAMIC_CRT=
-USE_DEFFILE=TRUE
-
-.INCLUDE : settings.mk
-
-CDEFS+=-DUNICODE
-
-UWINAPILIB=
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-
-SLOFILES =	$(SLO)$/relnotes.obj
-
-STDSHL+=	\
-    $(ADVAPI32LIB)\
-    $(SHELL32LIB)\
-    $(MSILIB)
-
-SHL1LIBS = $(SLB)$/$(TARGET).lib 
-
-SHL1TARGET = $(TARGET)
-SHL1IMPLIB = i$(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-SHL1DEPN = $(SLB)$/$(TARGET).lib
-SHL1BASE = 0x1c000000
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
deleted file mode 100644
index e814c1257..000000000
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#pragma warning(disable: 4917)
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <string.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <strsafe.h>
-#include <string>
-
-//----------------------------------------------------------
-#ifdef DEBUG
-inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
-{
-    TCHAR    buffer[1024];
-    va_list  args;
-
-    va_start( args, pFormat );
-    StringCchVPrintf( buffer, sizeof(buffer), pFormat, args );
-    OutputDebugString( buffer );
-}
-#else
-static inline void OutputDebugStringFormat( LPCTSTR, ... )
-{
-}
-#endif
-
-//----------------------------------------------------------
-inline bool IsValidHandle( HANDLE handle )
-{
-    return (NULL != handle) && (INVALID_HANDLE_VALUE != handle);
-}
-
-//----------------------------------------------------------
-static bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& value)
-{
-    DWORD sz = 0;
-    LPTSTR dummy = TEXT("");
-    if (MsiGetProperty(handle, name, dummy, &sz) == ERROR_MORE_DATA)
-    {
-        sz++;
-        DWORD nbytes = sz * sizeof(TCHAR);
-        LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
-        ZeroMemory(buff, nbytes);
-        MsiGetProperty(handle, name, buff, &sz);
-        value = buff;
-        return true;
-    }            
-    return false;
-}
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-//----------------------------------------------------------
-UINT ShowReleaseNotes( TCHAR* pFileName, TCHAR* pFilePath )
-{
-    TCHAR sFullPath[ MAX_PATH ];
-    
-    if ( FAILED( StringCchCopy( sFullPath, MAX_PATH, pFilePath ) ) )
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Could not copy path [%s]"), pFilePath );
-        return ERROR_SUCCESS;
-    }
-
-    if ( FAILED( StringCchCat( sFullPath, MAX_PATH, pFileName ) ) )
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Could not append filename [%s]"), pFileName );
-        return ERROR_SUCCESS;
-    }
-
-    HANDLE hFile = CreateFile( sFullPath, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    
-    if ( IsValidHandle(hFile) )
-    {
-        CloseHandle( hFile );
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Found file [%s]"), sFullPath );
-
-        SHELLEXECUTEINFOW aExecInf;
-        ZeroMemory( &aExecInf, sizeof( aExecInf ) );
-
-        aExecInf.cbSize = sizeof( aExecInf );
-        aExecInf.fMask  = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
-        aExecInf.lpVerb = TEXT("open");
-        aExecInf.lpFile = sFullPath;
-        aExecInf.lpDirectory = NULL;
-        aExecInf.nShow = SW_SHOWNORMAL;
-
-        SetLastError( 0 );
-        ShellExecuteEx( &aExecInf );
-    }
-    else
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: File not found [%s]"), sFullPath );
-    }
-
-    return ERROR_SUCCESS;
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowReleaseNotesBefore( MSIHANDLE )
-{
-    TCHAR szPath[MAX_PATH];
-
-    if( FAILED( SHGetSpecialFolderPath( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowReleaseNotesBefore called") );
-
-    return ShowReleaseNotes( TEXT("\\sun\\releasenote1.url"), szPath );
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowReleaseNotesAfter( MSIHANDLE )
-{
-    TCHAR szPath[MAX_PATH];
-
-    if( FAILED( SHGetSpecialFolderPath( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowReleaseNotesAfter called") );
-
-    return ShowReleaseNotes( TEXT("\\sun\\releasenote2.url"), szPath );
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle )
-{
-    std::wstring prodname;
-
-    GetMsiProp( handle, TEXT("ProductName"), prodname );
-    std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) );
-    if( std::wstring::npos == nIndex )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowSurveyAfter called") );
-
-    SHELLEXECUTEINFOW aExecInf;
-    ZeroMemory( &aExecInf, sizeof( aExecInf ) );
-
-    aExecInf.cbSize = sizeof( aExecInf );
-    aExecInf.fMask  = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
-    aExecInf.lpVerb = TEXT("open");
-    aExecInf.lpFile = TEXT("http://surveys.libreoffice.org/deinstall");
-    aExecInf.lpDirectory = NULL;
-    aExecInf.nShow = SW_SHOWNORMAL;
-
-    SetLastError( 0 );
-    ShellExecuteEx( &aExecInf );
-
-    return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */