[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                           |    5 --
 patches/dev300/patchability-reportbuilder.diff |   11 ----
 patches/dev300/patchability-scp2.diff          |   58 -------------------------
 patches/dev300/patchability-sdext.diff         |   17 -------
 4 files changed, 1 insertion(+), 90 deletions(-)

New commits:
commit a2d86e2f140e5b4128561328727a638bc3f1e9ef
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu May 27 17:17:28 2010 +0200

    Remove patchability patches and move progress-bar
    
    * patches/dev300/apply:
    * patches/dev300/patchability-reportbuilder-m16.diff:
    * patches/dev300/patchability-reportbuilder.diff:
    * patches/dev300/patchability-scp2-m16.diff:
    * patches/dev300/patchability-scp2.diff:
    * patches/dev300/patchability-sdext.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index eaba1f0..2ed3f62 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3749,10 +3749,7 @@ oox-pptx-import-fix-placeholder-text-style-1.diff, n#592906, rodo
 oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
 
 [ NovellOnlyWin32 ]
-
-patchability-sdext.diff, fridrich
-patchability-scp2.diff, fridrich
-patchability-reportbuilder.diff, fridrich
+sled10-splash.diff, i#123456, pmladek
 
 [ Fixes ]
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
diff --git a/patches/dev300/patchability-reportbuilder.diff b/patches/dev300/patchability-reportbuilder.diff
deleted file mode 100644
index 18919c2..0000000
--- a/patches/dev300/patchability-reportbuilder.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urEbwB --exclude=wntmsci12.pro reportbuilder/prj/d.lst reportbuilder/prj/d.lst
---- reportbuilder/prj/d.lst	2010-04-26 12:28:00.843750000 +0200
-+++ reportbuilder/prj/d.lst	2010-04-26 12:28:59.796875000 +0200
-@@ -1,6 +1,6 @@
- # Extensions
- 
--..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
-+..\%__SRC%\bin\report-builder.oxt %_DEST%\bin%_EXT%\sun-report-builder.oxt
- 
- # License
- mkdir: %_DEST%\bin%_EXT%\reportbuilder
diff --git a/patches/dev300/patchability-scp2.diff b/patches/dev300/patchability-scp2.diff
deleted file mode 100644
index 5eb252d..0000000
--- a/patches/dev300/patchability-scp2.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urEbwB --exclude=wntmsci12.pro scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
---- scp2/source/extensions/file_extensions.scp	2010-04-26 12:24:00.468750000 +0200
-+++ scp2/source/extensions/file_extensions.scp	2010-04-26 13:06:42.625000000 +0200
-@@ -41,11 +41,11 @@
- 
- #ifndef WITHOUT_EXTENSION_MINIMIZER
- 
--File gid_File_Oxt_Presentation_Minimizer
-+File gid_File_Oxt_Sun_Presentation_Minimizer
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Brand_Dir_Share_Extension_Install;
--    Name = "presentation-minimizer.oxt";
-+    Name = "sun-presentation-minimizer.oxt";
- End
- 
- #endif
-@@ -54,11 +54,11 @@
- 
- #ifndef WITHOUT_EXTENSION_REPORTDESIGN
- 
--File gid_File_Oxt_Report_Builder
-+File gid_File_Oxt_Sun_Report_Builder
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Brand_Dir_Share_Extension_Install;
--    Name = "report-builder.oxt";
-+    Name = "sun-report-builder.oxt";
- End
- 
- #endif
-@@ -67,7 +67,7 @@
- 
- #ifndef WITHOUT_EXTENSION_MEDIAWIKI
- 
--File gid_File_Oxt_MediaWiki
-+File gid_File_Oxt_Sun_MediaWiki
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Brand_Dir_Share_Extension_Install;
-@@ -80,7 +80,7 @@
- 
- #ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
- 
--File gid_File_Oxt_Presenter_Screen
-+File gid_File_Oxt_Sun_Presenter_Screen
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Brand_Dir_Share_Extension_Install;
-@@ -93,7 +93,7 @@
- 
- #ifndef WITHOUT_EXTENSION_PDFIMPORT
- 
--File gid_File_Oxt_PDF_Import
-+File gid_File_Oxt_Sun_PDF_Import
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Brand_Dir_Share_Extension_Install;
diff --git a/patches/dev300/patchability-sdext.diff b/patches/dev300/patchability-sdext.diff
deleted file mode 100644
index fcd0c70..0000000
--- a/patches/dev300/patchability-sdext.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urEbwB --exclude=wntmsci12.pro sdext/prj/d.lst sdext/prj/d.lst
---- sdext/prj/d.lst	2010-04-26 12:19:16.062500000 +0200
-+++ sdext/prj/d.lst	2010-04-26 12:20:40.187500000 +0200
-@@ -1,11 +1,11 @@
- mkdir: %_DEST%\bin%_EXT%\minimizer
- mkdir: %_DEST%\bin%_EXT%\presenter
- mkdir: %_DEST%\bin%_EXT%\pdfimport
--..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\presentation-minimizer.oxt
-+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
- ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
- ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
- ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
- ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
- ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
--..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
-+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
- ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt