[Libreoffice-commits] .: setup_native/prj setup_native/source

[Tor Lillqvist]

 setup_native/prj/d.lst                              |    5 -----
 setup_native/source/win32/nsis/downloadtemplate.nsi |   20 +++-----------------
 2 files changed, 3 insertions(+), 22 deletions(-)

New commits:
commit e9d1ceffe609e34c4f02bc76237117ada0742cd1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 26 13:31:51 2011 +0300

    Kill BrOffice, fdo#36262

diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 6aa6460..d0443cf 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -1,5 +1,4 @@
 mkdir: %_DEST%\bin%_EXT%\osl
-mkdir: %_DEST%\bin%_EXT%\broffice
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
@@ -36,11 +35,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
 ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
 ..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
 ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
-..\source\mac\broffice\osxdndinstall.png %_DEST%\bin%_EXT%\broffice\osxdndinstall.png
-..\source\mac\broffice\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png
-..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store
 ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
-..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif
 ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
 ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
 ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index 6484ef9..90fcdfe 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -275,24 +275,10 @@ ALLLANGUAGESPLACEHOLDER
 
 Function SetupBranding
 	File "/oname=$PLUGINSDIR\modern-header.bmp" BANNERBMPPLACEHOLDER
-	File "/oname=$PLUGINSDIR\modern-header-br.bmp" BANNERBMPPLACEHOLDER_BR
 	File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
-	File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
-
-	; use broffice specific branding if we are in Brazil
-;	messageBox MB_OK "Language: $LANGUAGE"
-	StrCmp $LANGUAGE "1046" BrOfficeSplash DefaultSplash
-	DefaultSplash:
-;		messageBox MB_OK "LibreOffice"
-		SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
-		!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
-		GoTo atEnd
-	BrOfficeSplash:
-;		messageBox MB_OK "BrOffice"
-		SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header-br.bmp"
-		!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard-br.bmp"
-		GoTo atEnd
-	atEnd:
+
+	SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+	!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
 FunctionEnd
 
 ; Reserve files