[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    3 +++
 patches/dev300/win32-no-uninstall-survey.diff |   18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 0cc3eed0db67dd78cfb8afe3b2156f04945c8971
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 18 01:33:36 2009 +0300

    We don't want any stinking survey
    
    * patches/dev300/win32-no-uninstall-survey.diff: New file. Don't
      show any survey after uninstalling OOo.
    
    * patches/dev300/apply: Add it to Win32Only.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1cfac5a..4645668 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2760,6 +2760,9 @@ win32-no-seterror-when-debugging.diff, tml
 # restore them if still relevant when uninstalling OOo
 win32-restore-associations.diff, n#530872, tml
 
+# No survey after uninstallation, thank you
+win32-no-uninstall-survey.diff, tml
+
 [ Fixes ]
 #sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
 
diff --git a/patches/dev300/win32-no-uninstall-survey.diff b/patches/dev300/win32-no-uninstall-survey.diff
new file mode 100644
index 0000000..ca71a2d
--- /dev/null
+++ b/patches/dev300/win32-no-uninstall-survey.diff
@@ -0,0 +1,18 @@
+--- scp2/source/ooo/windowscustomaction_ooo.scp
++++ scp2/source/ooo/windowscustomaction_ooo.scp
+@@ -502,15 +502,6 @@
+ 	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+ End
+ 
+-WindowsCustomAction gid_Customaction_ShowSurvey
+-	Name = "ShowSurveyAfterUninstall";
+-	Typ = "65";
+-	Source = "relnotes.dll";
+-	Target = "ShowSurveyAfter";
+-	Inbinarytable = 1;
+-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
+-End
+-
+ WindowsCustomAction gid_Customaction_SelectLanguage
+ 	Name = "SelectLanguage";
+ 	Typ = "321";