approval for upload of openoffice.org 1:2.4.1-10
Hi,
now that -9 will probably finally be in this night (after 26/5 days!)
I'd like to have pre-approval for the -10 upload I was planning since over a
week. It contains some minor changes in additrion to important cherry-pick fixes:
- GenericName= for Math and Draws .desktop files - http://www.openoffice.org/issues/show_bug.cgi?id=93909, #498922 and #498924
- ../share/template/<lnag> - #496047
- making openoffice.org depend on -report-builder. Will not affect Debians
packages (-report-builder depends on -bin) but when someone wants to install
SRB from upstream for whatever reason he needs librpt*. And as the
openoffice.org metapackage is supposed to install everything a full
upstream OOo installation would install, too...
- speed improvements on finding the mozilla profile and thus their
certificates - #499062
- warning for people who want to upload a full set that they need to do
that on an arch where mono is enabled as that's _all packages
- lintian fix
Those important fixes are:
- fix upgrade problem (WebWizard) - #360575
- fix hang in calc in some conditions - #499374
- fix chart crash - http://www.openoffice.org/issues/show_big.cgi?id=90071
- fix when ran from mailcap (e.g. mutt) - #396276
And last but not least
- ko translation fixes
Quite many changes, but given how long this was in the pipleine already...
Diff attached.
I'd like to upload as soon as it's sure that -9 is in testing.
Regards,
Rene
diff -u openoffice.org-2.4.1/ooo-build/ChangeLog openoffice.org-2.4.1/ooo-build/ChangeLog
--- openoffice.org-2.4.1/ooo-build/ChangeLog
+++ openoffice.org-2.4.1/ooo-build/ChangeLog
@@ -1,3 +1,45 @@
+2008-09-30 Rene Engelhard <rene@debian.org>
+
+ * patches/src680/unxsplash-rework.diff: don't run the external oosplash
+ with -nologo (no splash anyway) and with the (new) -no-ooplash.
+ Latter needed for e.g. OOo calls from mut via mimecap (see
+ bugs.debian.org/39276)
+
+2008-09-24 Rene Engelhard <rene@debian.org>
+
+ * patches/src680/soffice-detect-mozilla-certificates.diff: optimize
+ (see bugs.debian.org/499062)
+
+2008-09-23 Rene Engelhard <rene@debian.org>
+
+ * patches/dev300/apply,
+ patches/dev300/soffice-remove-webwizard.diff: remove WebWizard
+ remains on startup
+
+2008-09-22 Rene Engelhard <rene@debian.org>
+
+ * patches/src680/apply,
+ patches/src680/cws-chart28.diff: backport cws chart28
+
+2008-09-18 Rene Engelhard <rene@debian.org>
+
+ merge from ooo-build-2-4-1:
+
+ * src/sdf/ko-gallery.sdf
+ Fixed fourth line of translation. Thanks rene!
+ * src/sdf/ko-pathes.sdf
+ Fixed CAPS language name "KO"
+ * patches/src680/sw-field-patch.diff: Removed some debug code.(n#426348)
+ * patches/dev300/sc-skip-overlapped-cells.diff: check the validity of
+ the row number before calling HasAttrib to check for an overlapped
+ state of a cell. Not doing so may cause Calc to hang.
+
+ merge from ooo-build-3-0:
+ * patches/dev300/apply,
+ patches/dev300/math-draw-generic-name.diff,
+ patches/dev300/math-draw-generic-name-localize.diff: add GenericName
+ to Math and Draw .desktop files
+
2008-07-28 Rene Engelhard <rene@debian.org>
merge from ooo-build-2-4-1:
diff -u openoffice.org-2.4.1/ooo-build/src/sdf/ko-patches.sdf openoffice.org-2.4.1/ooo-build/src/sdf/ko-patches.sdf
--- openoffice.org-2.4.1/ooo-build/src/sdf/ko-patches.sdf
+++ openoffice.org-2.4.1/ooo-build/src/sdf/ko-patches.sdf
@@ -2,173 +2,173 @@
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 11 0 KO 을 포함함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 11 0 ko 을 포함함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 12 0 en-US Does not Contain 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 12 0 KO 을 포함하지 않음 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 12 0 ko 을 포함하지 않음 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 13 0 en-US Begins with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 13 0 KO 으로 시작함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 13 0 ko 으로 시작함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 14 0 en-US Ends with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 14 0 KO 으로 끝남 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND1 14 0 ko 으로 끝남 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 11 0 en-US Contains 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 11 0 KO 을 포함함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 11 0 ko 을 포함함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 12 0 en-US Does not Contain 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 12 0 KO 을 포함하지 않음 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 12 0 ko 을 포함하지 않음 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 13 0 en-US Begins with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 13 0 KO 으로 시작함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 13 0 ko 으로 시작함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 14 0 en-US Ends with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 14 0 KO 으로 끝남 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND2 14 0 ko 으로 끝남 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 11 0 en-US Contains 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 11 0 KO 을 포함함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 11 0 ko 을 포함함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 12 0 en-US Does not Contain 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 12 0 KO 을 포함하지 않음 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 12 0 ko 을 포함하지 않음 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 13 0 en-US Begins with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 13 0 KO 으로 시작함 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 13 0 ko 으로 시작함 20051112 14:45:13
sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 14 0 en-US Ends with 20051112 14:45:13
-sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 14 0 KO 으로 끝남 20051112 14:45:13
+sc source\ui\src\filter.src 0 stringlist RID_SCDLG_FILTER.LB_COND3 14 0 ko 으로 끝남 20051112 14:45:13
sc source\ui\src\popup.src 0 menuitem RID_POPUP_PAGEBREAK SID_INSERT_POSTIT SID_INSERT_POSTIT 0 en-US Insert Not~e 20051112 14:45:13
-sc source\ui\src\popup.src 0 menuitem RID_POPUP_PAGEBREAK SID_INSERT_POSTIT SID_INSERT_POSTIT 0 KO Not~e를 삽입함 20051112 14:45:13
+sc source\ui\src\popup.src 0 menuitem RID_POPUP_PAGEBREAK SID_INSERT_POSTIT SID_INSERT_POSTIT 0 ko Not~e를 삽입함 20051112 14:45:13
sc source\ui\src\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_NATURALSORT 242 en-US Enable ~natural sort 20060218 15:28:33
-sc source\ui\src\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_NATURALSORT 242 KO ~자연스럽게 정렬케 함. 20060218 15:28:33
+sc source\ui\src\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_NATURALSORT 242 ko ~자연스럽게 정렬케 함. 20060218 15:28:33
sd source\ui\app\menuids_tmpl.src 0 menuitem MN_SAVE_GRAPHIC SID_SAVE_GRAPHIC SID_SAVE_GRAPHIC 0 en-US Save ~Graphic... 20051112 14:45:13
-sd source\ui\app\menuids_tmpl.src 0 menuitem MN_SAVE_GRAPHIC SID_SAVE_GRAPHIC SID_SAVE_GRAPHIC 0 KO ~Graphic...을 저장함. 20051112 14:45:13
+sd source\ui\app\menuids_tmpl.src 0 menuitem MN_SAVE_GRAPHIC SID_SAVE_GRAPHIC SID_SAVE_GRAPHIC 0 ko ~Graphic...을 저장함. 20051112 14:45:13
helpcontent2 source\text\scalc\01\12030200.xhp 0 help bm_id3147228 0 en-US \<bookmark_value\>sorting; options for database ranges\</bookmark_value\>\<bookmark_value\>sorting;Asian languages\</bookmark_value\>\<bookmark_value\>Asian languages;sorting\</bookmark_value\>\<bookmark_value\>phonebook sorting rules\</bookmark_value\>\<bookmark_value\>natural sort algorithm\</bookmark_value\> 20060208 23:29:45
-helpcontent2 source\text\scalc\01\12030200.xhp 0 help bm_id3147228 0 KO \<bookmark_value\>sorting; options for database ranges\</bookmark_value\>\<bookmark_value\>sorting;Asian languages\</bookmark_value\>\<bookmark_value\>Asian languages;sorting\</bookmark_value\>\<bookmark_value\>phonebook sorting rules\</bookmark_value\>\<bookmark_value\>natural sort algorithm\</bookmark_value\> 20060211 17:16:46
+helpcontent2 source\text\scalc\01\12030200.xhp 0 help bm_id3147228 0 ko \<bookmark_value\>sorting; options for database ranges\</bookmark_value\>\<bookmark_value\>sorting;Asian languages\</bookmark_value\>\<bookmark_value\>Asian languages;sorting\</bookmark_value\>\<bookmark_value\>phonebook sorting rules\</bookmark_value\>\<bookmark_value\>natural sort algorithm\</bookmark_value\> 20060211 17:16:46
helpcontent2 source\text\scalc\01\12030200.xhp 0 help hd_id3147438 0 en-US Enable natural sort 20060208 23:29:45
-helpcontent2 source\text\scalc\01\12030200.xhp 0 help hd_id3147438 0 KO Enable natural sort 20060211 17:16:46
+helpcontent2 source\text\scalc\01\12030200.xhp 0 help hd_id3147438 0 ko Enable natural sort 20060211 17:16:46
helpcontent2 source\text\scalc\01\12030200.xhp 0 help par_id3149378 0 en-US \<ahelp hid=\"SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT\"\>Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.\</ahelp\> For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general. 20060208 23:29:45
-helpcontent2 source\text\scalc\01\12030200.xhp 0 help par_id3149378 0 KO \<ahelp hid=\"SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT\"\>Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.\</ahelp\> For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general. 20060211 17:16:46
+helpcontent2 source\text\scalc\01\12030200.xhp 0 help par_id3149378 0 ko \<ahelp hid=\"SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT\"\>Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.\</ahelp\> For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general. 20060211 17:16:46
scp2 source\accessories\module_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES 0 en-US Accessories 20051221 23:33:07
-scp2 source\accessories\module_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES 0 KO 액세서리 20051221 23:33:07
+scp2 source\accessories\module_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES 0 ko 액세서리 20051221 23:33:07
scp2 source\accessories\module_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES 0 en-US Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts. 20051221 23:33:07
-scp2 source\accessories\module_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES 0 KO 갤러리, 템플릿, 샘플 문서 및 폰트 등 유용한 %PRODUCTNAME 액세서리들 20051221 23:33:07
+scp2 source\accessories\module_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES 0 ko 갤러리, 템플릿, 샘플 문서 및 폰트 등 유용한 %PRODUCTNAME 액세서리들 20051221 23:33:07
scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 en-US Gallery 20051221 23:33:07
-scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 KO 샐러리 20051221 23:33:07
+scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 ko 샐러리 20051221 23:33:07
scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 en-US The %PRODUCTNAME Gallery contains more than 2900 element in various themes. 20051221 23:33:07
-scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 KO 다양한 테마 속에 2900개 이상 요소들을 포함한 %PRODUCTNAME 갤러리 20051221 23:33:07
+scp2 source\accessories\module_gallery_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY 0 ko 다양한 테마 속에 2900개 이상 요소들을 포함한 %PRODUCTNAME 갤러리 20051221 23:33:07
scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 en-US Templates 20051221 23:33:07
-scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 KO 템플릿 20051221 23:33:07
+scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 ko 템플릿 20051221 23:33:07
scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 en-US Create perfect documents within seconds with document templates. 20051221 23:33:07
-scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 KO 문서 테플릿을 통해 짧은 시간에 완벽한 문서들을 생성 20051221 23:33:07
+scp2 source\accessories\module_templates_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES 0 ko 문서 테플릿을 통해 짧은 시간에 완벽한 문서들을 생성 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 en-US Sample documents 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 KO 샘플 문서들 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 ko 샘플 문서들 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 en-US Sample documents are good for learning. 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 KO 샘플 문서들은 학습에 훌륭함. 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES 0 ko 샘플 문서들은 학습에 훌륭함. 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 en-US Documentations 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 KO 문서화 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 ko 문서화 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 en-US %PRODUCTNAME documentations. 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 KO %PRODUCTNAME 문서화 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS 0 ko %PRODUCTNAME 문서화 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 en-US Advertisement 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 KO 광고 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 ko 광고 20051221 23:33:07
scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 en-US %PRODUCTNAME advertisement materials. 20051221 23:33:07
-scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 KO %PRODUCTNAME의 광고 자료 20051221 23:33:07
+scp2 source\accessories\module_samples_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT 0 ko %PRODUCTNAME의 광고 자료 20051221 23:33:07
scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 en-US Fonts 20051221 23:33:07
-scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 KO 폰트 20051221 23:33:07
+scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 ko 폰트 20051221 23:33:07
scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 en-US Additional fonts for %PRODUCTNAME and other applications. 20051221 23:33:07
-scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 KO %PRODUCTNAME 과 기타 응용프로그램용 추가 폰트 20051221 23:33:07
+scp2 source\accessories\module_font_accessories.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS 0 ko %PRODUCTNAME 과 기타 응용프로그램용 추가 폰트 20051221 23:33:07
scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 en-US SVG Import 20051112 14:45:13
-scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 KO SVG 임포트 20051112 14:45:13
+scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 ko SVG 임포트 20051112 14:45:13
scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 en-US Support for SVG Import 20051112 14:45:13
-scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 KO SVG 임포트 지원 20051112 14:45:13
+scp2 source\javafilter\module_javafilter.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_JAVAFILTER_SVGIMPORT 0 ko SVG 임포트 지원 20051112 14:45:13
officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Commands.macro:///Premium.OOoHelpDocumentation.OpenHelpDocument Label 0 en-US User's manual 20050706 14:45:13
-officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Commands.macro:///Premium.OOoHelpDocumentation.OpenHelpDocument Label 0 KO 사용자 매뉴얼 20060706 14:45:13
+officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Commands.macro:///Premium.OOoHelpDocumentation.OpenHelpDocument Label 0 ko 사용자 매뉴얼 20060706 14:45:13
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_124 0 en-US Build contributed in collaboration with the community by OxygenOffice Team. For credits, see: http://www.openoffice.org/welcome/credits.html 20070218 23:00:20
-instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_124 0 KO OxygenOffice 팀과 커뮤니티간 협력으로 빌드. 참조: http://www.openoffice.org/welcome/credits.html 20070218 23:00:20
+instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf 0 LngText OOO_CONTROL_124 0 ko OxygenOffice 팀과 커뮤니티간 협력으로 빌드. 참조: http://www.openoffice.org/welcome/credits.html 20070218 23:00:20
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.tile-flip Label 0 en-US Flipping tiles 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.tile-flip Label 0 KO 끈적한 타일 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.tile-flip Label 0 ko 끈적한 타일 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.outside-cube Label 0 en-US Outside turning cube 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.outside-cube Label 0 KO 외면 회전면체 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.outside-cube Label 0 ko 외면 회전면체 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.revolving-circles Label 0 en-US Revolving circles 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.revolving-circles Label 0 KO 회전식 원 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.revolving-circles Label 0 ko 회전식 원 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turning-helix Label 0 en-US Turning helix 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turning-helix Label 0 KO 회전 나선 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turning-helix Label 0 ko 회전 나선 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.inside-cube Label 0 en-US Inside turning cube 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.inside-cube Label 0 KO 외부 회전면체 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.inside-cube Label 0 ko 외부 회전면체 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fall Label 0 en-US Fall 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fall Label 0 KO 가을 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fall Label 0 ko 가을 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-around Label 0 en-US Turn around 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-around Label 0 KO 방향 전환 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-around Label 0 ko 방향 전환 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.iris Label 0 en-US Iris 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.iris Label 0 KO 아이리스 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.iris Label 0 ko 아이리스 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-down Label 0 en-US Turn down 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-down Label 0 KO 접힌 부분 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.turn-down Label 0 ko 접힌 부분 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.rochade Label 0 en-US Rochade 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.rochade Label 0 KO Rochade 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.rochade Label 0 ko Rochade 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dv Label 0 en-US Venetian Blinds 3D Vertical 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dv Label 0 KO 3D 세로형 베니션 블라인드 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dv Label 0 ko 3D 세로형 베니션 블라인드 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dh Label 0 en-US Venetian Blinds 3D Horizontal 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dh Label 0 KO 3D 가로형 베니션 블라인드 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.venetian3dh Label 0 ko 3D 가로형 베니션 블라인드 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.static Label 0 en-US Static 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.static Label 0 KO 정지 모드 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.static Label 0 ko 정지 모드 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.finedissolve Label 0 en-US Fine Dissolve 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.finedissolve Label 0 KO 맑은 액체 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.finedissolve Label 0 ko 맑은 액체 2002. 2. 2. 2:2:2
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ToggleSheetGrid Label 0 en-US Toggle Grid Lines for Current Sheet 2002. 2. 2. 2:2:2
-officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ToggleSheetGrid Label 0 KO 현재 시트를 위한 격자형 행들 2002. 2. 2. 2:2:2
+officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ToggleSheetGrid Label 0 ko 현재 시트를 위한 격자형 행들 2002. 2. 2. 2:2:2
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAINDLG_TITLE 0 en-US Optimization Solver 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAINDLG_TITLE 0 KO 최적화 해결 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAINDLG_TITLE 0 ko 최적화 해결 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DEFINE_MODEL 49528 en-US Model 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DEFINE_MODEL 49528 KO 모델 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DEFINE_MODEL 49528 ko 모델 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_SET_TARGET_CELL 49528 en-US Target 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_SET_TARGET_CELL 49528 KO 타겟 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_SET_TARGET_CELL 49528 ko 타겟 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_GOAL 49528 en-US Goal 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_GOAL 49528 KO 목표 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_GOAL 49528 ko 목표 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAXIMIZE 49528 en-US Maximize 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAXIMIZE 49528 KO 최대화 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MAXIMIZE 49528 ko 최대화 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MINIMIZE 49528 en-US Minimize 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MINIMIZE 49528 KO 최소화 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MINIMIZE 49528 ko 최소화 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DECISIONVAR_CELLS 49888 en-US By changing cells 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DECISIONVAR_CELLS 49888 KO 셀 변화에 의해서 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_DECISIONVAR_CELLS 49888 ko 셀 변화에 의해서 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT_SEP 49528 en-US Subject to the constraints 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT_SEP 49528 KO 제한하기 위한 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT_SEP 49528 ko 제한하기 위한 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINTDLG_TITLE 49528 en-US Constraint 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINTDLG_TITLE 49528 KO 제한 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINTDLG_TITLE 49528 ko 제한 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CELL_REFERENCE 49856 en-US Cell Reference 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CELL_REFERENCE 49856 KO 셀 참조 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CELL_REFERENCE 49856 ko 셀 참조 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT 49528 en-US Constraint 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT 49528 KO 제한 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_CONSTRAINT 49528 ko 제한 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OK 49528 en-US OK 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OK 49528 KO OK 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OK 49528 ko OK 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CANCEL 49528 en-US Cancel 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CANCEL 49528 KO 취소 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CANCEL 49528 ko 취소 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_REF_CON_RANGE_MISMATCH 49888 en-US The reference and constraint ranges do not match. 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_REF_CON_RANGE_MISMATCH 49888 KO 참조와 제한 영역이 일치하지 않음 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_REF_CON_RANGE_MISMATCH 49888 ko 참조와 제한 영역이 일치하지 않음 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_ADD 49728 en-US Add 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_ADD 49728 KO 추가 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_ADD 49728 ko 추가 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CHANGE 50328 en-US Change 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CHANGE 50328 KO 변경 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CHANGE 50328 ko 변경 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_DELETE 50328 en-US Delete 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_DELETE 50328 KO 삭제 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_DELETE 50328 ko 삭제 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SOLVE 50328 en-US Solve 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SOLVE 50328 KO 해결 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SOLVE 50328 ko 해결 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_RESET 50328 en-US Reset 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_RESET 50328 KO 재설정 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_RESET 50328 ko 재설정 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OPTIONS 49816 en-US Options 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OPTIONS 49816 KO 옵션 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_OPTIONS 49816 ko 옵션 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SAVE_MODEL 50328 en-US Save 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SAVE_MODEL 50328 KO 저장 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_SAVE_MODEL 50328 ko 저장 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_LOAD_MODEL 49880 en-US Load 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_LOAD_MODEL 49880 KO 로드 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_LOAD_MODEL 49880 ko 로드 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CLOSE 49528 en-US Close 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CLOSE 49528 KO 종료 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_BTN_CLOSE 49528 ko 종료 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_NOT_FOUND 49920 en-US Solution could not be found 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_NOT_FOUND 49920 KO 해결방법이 없습니다. 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_NOT_FOUND 49920 ko 해결방법이 없습니다. 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_FOUND 49528 en-US Solution found 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_FOUND 49528 KO 해결방법이 있습니다. 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_SOLUTION_FOUND 49528 ko 해결방법이 있습니다. 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_CELL_GEOMETRIES_DIFFER 49528 en-US Cell geometries differ 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_CELL_GEOMETRIES_DIFFER 49528 KO 셀의 기하학적 특성이 다릅니다. 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_CELL_GEOMETRIES_DIFFER 49528 ko 셀의 기하학적 특성이 다릅니다. 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_MAX_ITERATION_REACHED 50320 en-US Maximum iteration reached 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_MAX_ITERATION_REACHED 50320 KO 최대 반복에 다다름. 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_MAX_ITERATION_REACHED 50320 ko 최대 반복에 다다름. 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_STD_EXCEPTION_CAUGHT 49744 en-US Standard exception caught 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_STD_EXCEPTION_CAUGHT 49744 KO 표준 예외가 포착됨 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_STD_EXCEPTION_CAUGHT 49744 ko 표준 예외가 포착됨 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_ITERATION_TIMED_OUT 49928 en-US Iteration timed out 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_ITERATION_TIMED_OUT 49928 KO 반복 타임 아웃 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_ITERATION_TIMED_OUT 49928 ko 반복 타임 아웃 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_GOAL_NOT_SET 49528 en-US Goal is not set 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_GOAL_NOT_SET 49528 KO 목표가 설정되지 않음. 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_MSG_GOAL_NOT_SET 49528 ko 목표가 설정되지 않음. 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTIONDLG_TITLE 49528 en-US Options 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTIONDLG_TITLE 49528 KO 옵션 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTIONDLG_TITLE 49528 ko 옵션 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_ASSUME_LINEAR 49864 en-US Assume linear model 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_ASSUME_LINEAR 49864 KO 선형 모델을 가정함 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_ASSUME_LINEAR 49864 ko 선형 모델을 가정함 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_POSITIVE 49760 en-US Allow only positive values 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_POSITIVE 49760 KO 오직 Positive 값만 허용 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_POSITIVE 49760 ko 오직 Positive 값만 허용 20071010 14:10:23
scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_INTEGER 49856 en-US Allow only integer values 20071010 14:10:23
-scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_INTEGER 49856 KO 오직 정수값만 허용 20071010 14:10:23
+scsolver source\ui\scsolver.src 0 string SCSOLVER_STR_OPTION_VAR_INTEGER 49856 ko 오직 정수값만 허용 20071010 14:10:23
scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.OfficeToolBar.scsolver.SolverImpl.m1 Title 0 en-US Solver 20071010 14:10:23
-scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.OfficeToolBar.scsolver.SolverImpl.m1 Title 0 KO 솔버 20071010 14:10:23
+scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.OfficeToolBar.scsolver.SolverImpl.m1 Title 0 ko 솔버 20071010 14:10:23
scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.AddonMenu.scsolver.SolverImpl Title 0 en-US Solver 20071010 14:10:23
-scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.AddonMenu.scsolver.SolverImpl Title 0 KO 솔버 20071010 14:10:23
+scsolver workben\addon_pkg\Addons.xcu 0 value .Addons.AddonUI.AddonMenu.scsolver.SolverImpl Title 0 ko 솔버 20071010 14:10:23
diff -u openoffice.org-2.4.1/ooo-build/patches/src680/sc-skip-overlapped-cells.diff openoffice.org-2.4.1/ooo-build/patches/src680/sc-skip-overlapped-cells.diff
--- openoffice.org-2.4.1/ooo-build/patches/src680/sc-skip-overlapped-cells.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/sc-skip-overlapped-cells.diff
@@ -17,8 +17,8 @@
BOOL bUp = ( nMovY < 0 );
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
- while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+ while ( (VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED) )
++ while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
++ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
{
// #53697# ausgeblendete ueberspringen (s.o.)
nRow += nMovY;
@@ -27,8 +27,8 @@
nRow = 0;
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
- while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+ while ( (VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED) )
++ while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
++ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
{
// #53697# ausgeblendete ueberspringen (s.o.)
nRow += nMovY;
diff -u openoffice.org-2.4.1/ooo-build/patches/src680/apply openoffice.org-2.4.1/ooo-build/patches/src680/apply
--- openoffice.org-2.4.1/ooo-build/patches/src680/apply
+++ openoffice.org-2.4.1/ooo-build/patches/src680/apply
@@ -325,6 +325,8 @@
cws-cmcfixes47-sw.diff, i#90306
+cws-chart28.diff, i#90071
+
[ CWSBackports < ooh680-m17 ]
cws-dba241e.diff, i#87092, i#90011
@@ -522,6 +524,9 @@
# fix by Caolan, already in OOo-3.0
raise-annotation-priority-above-charproperties-i53885.diff, i#53885, pmladek
+math-draw-generic-name.diff, i#93909, rengelha
+math-draw-generic-name-localize.diff, i#93909, rengelha
+
[ Fixes > ooh680-m15 ]
# init all members in svx's line geometry creator
@@ -966,6 +971,7 @@
# to download it from elsewhere
reportdesign-mention-package.diff, rengelha
+soffice-remove-webwizard.diff
[ DebianOnly ]
diff -u openoffice.org-2.4.1/ooo-build/patches/src680/unxsplash-rework.diff openoffice.org-2.4.1/ooo-build/patches/src680/unxsplash-rework.diff
--- openoffice.org-2.4.1/ooo-build/patches/src680/unxsplash-rework.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/unxsplash-rework.diff
@@ -46,12 +46,17 @@
index 7fd1393..20936bd 100644
--- desktop/scripts/soffice.sh
+++ desktop/scripts/soffice.sh
-@@ -262,6 +262,10 @@ else
+@@ -262,6 +262,15 @@ else
fi
export PATH
-
+
++for arg in $@; do
++ if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
++ no_oosplash=y;
++ fi
++done
+# test for availability of the fast external splash
-+if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] ; then
++if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
+ sd_binary="oosplash.bin"
+fi
diff -u openoffice.org-2.4.1/ooo-build/patches/src680/sw-field-patch.diff openoffice.org-2.4.1/ooo-build/patches/src680/sw-field-patch.diff
--- openoffice.org-2.4.1/ooo-build/patches/src680/sw-field-patch.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/sw-field-patch.diff
@@ -2390,10 +2390,10 @@
if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
{
pDataStream->Seek( nPicLocFc + aPic.cbHeader );
-+ int len=aPic.lcb-aPic.cbHeader;
-+ char *pBuf=(char*)malloc(len);
-+ pDataStream->Read( pBuf, len);
-+ pDataStream->Seek( nPicLocFc + aPic.cbHeader );
++// int len=aPic.lcb-aPic.cbHeader;
++// char *pBuf=(char*)malloc(len);
++// pDataStream->Read( pBuf, len);
++// pDataStream->Seek( nPicLocFc + aPic.cbHeader );
aFormula.FormulaRead(nWhich,pDataStream);
bRet = true;
}
diff -u openoffice.org-2.4.1/ooo-build/patches/src680/soffice-detect-mozilla-certificates.diff openoffice.org-2.4.1/ooo-build/patches/src680/soffice-detect-mozilla-certificates.diff
--- openoffice.org-2.4.1/ooo-build/patches/src680/soffice-detect-mozilla-certificates.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/soffice-detect-mozilla-certificates.diff
@@ -5,7 +5,7 @@
diff -u -u -r1.25 soffice.sh
--- desktop/scripts/soffice.sh 5 Jul 2006 22:33:58 -0000 1.25
+++ desktop/scripts/soffice.sh 9 Sep 2006 11:07:33 -0000
-@@ -189,6 +189,24 @@
+@@ -189,6 +189,29 @@
OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
export OPENOFFICE_MOZILLA_FIVE_HOME
@@ -18,7 +18,12 @@
+ fi;
+ done
+ if [ -n "$dir" ]; then
-+ cert8=`find $dir -name "cert8.db" | head -n 1`
++ # In most case cert8.db will be in $dir/*/cert8.db.
++ # Test this first. Do a full search otherwise.
++ cert8=`find $dir -maxdepth 2 -name "cert8.db" | head -n 1`
++ if [ ! -n "$cert8" ]; then
++ cert8=`find $dir -name "cert8.db" | head -n 1`
++ fi
+ if [ -n "$cert8" ]; then
+ profiledir=`dirname "$cert8"`
+ MOZILLA_CERTIFICATE_FOLDER=$profiledir
diff -u openoffice.org-2.4.1/debian/openoffice.org-draw.mime openoffice.org-2.4.1/debian/openoffice.org-draw.mime
--- openoffice.org-2.4.1/debian/openoffice.org-draw.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-draw.mime
@@ -2,12 +2,12 @@
# shared-mime-info
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.graphics; soffice -draw '%s'; edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; nametemplate=%s.odg; priority=9
-application/vnd.oasis.opendocument.graphics-template; soffice -draw '%s'; edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing Template"; nametemplate=%s.otg; priority=9
+application/vnd.oasis.opendocument.graphics; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; nametemplate=%s.odg; priority=9
+application/vnd.oasis.opendocument.graphics-template; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing Template"; nametemplate=%s.otg; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.draw; soffice -draw '%s'; edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing"; nametemplate=%s.sxd; priority=8
-application/vnd.sun.xml.draw.template; soffice -draw '%s'; edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template"; nametemplate=%s.std; priority=8
+application/vnd.sun.xml.draw; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing"; nametemplate=%s.sxd; priority=8
+application/vnd.sun.xml.draw.template; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template"; nametemplate=%s.std; priority=8
#
###
diff -u openoffice.org-2.4.1/debian/openoffice.org-calc.mime openoffice.org-2.4.1/debian/openoffice.org-calc.mime
--- openoffice.org-2.4.1/debian/openoffice.org-calc.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-calc.mime
@@ -2,35 +2,35 @@
# shared-mime-info
# Generic
-text/csv; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
-text/spreadsheet; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange Document"; nametemplate=%s.slk; priority=3
+text/csv; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
+text/spreadsheet; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange Document"; nametemplate=%s.slk; priority=3
# Corel Quattro Pro
-application/x-quattropro; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet"; nametemplate=%s.wb2; priority=3
+application/x-quattropro; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet"; nametemplate=%s.wb2; priority=3
# dBase dBASE
-application/x-dbf; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
+application/x-dbf; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
# ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-excel.sheet.macroEnabled.12; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm; priority=3
-application/vnd.ms-excel.template.macroEnabled.12; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm; priority=3
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx; priority=3
-application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx; priority=3
+application/vnd.ms-excel.sheet.macroEnabled.12; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm; priority=3
+application/vnd.ms-excel.template.macroEnabled.12; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm; priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx; priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx; priority=3
# IBM Lotus 1-2-3
-application/vnd.lotus-1-2-3; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet"; nametemplate=%s.123; priority=3
+application/vnd.lotus-1-2-3; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet"; nametemplate=%s.123; priority=3
# Microsoft Excel
-application/vnd.ms-excel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls; priority=3
+application/vnd.ms-excel; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls; priority=3
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.chart; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc; priority=9
-application/vnd.oasis.opendocument.spreadsheet; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; nametemplate=%s.ods; priority=9
-application/vnd.oasis.opendocument.spreadsheet-template; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet Template"; nametemplate=%s.ots; priority=9
+application/vnd.oasis.opendocument.chart; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc; priority=9
+application/vnd.oasis.opendocument.spreadsheet; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; nametemplate=%s.ods; priority=9
+application/vnd.oasis.opendocument.spreadsheet-template; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet Template"; nametemplate=%s.ots; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.calc; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet"; nametemplate=%s.sxc; priority=8
-application/vnd.sun.xml.calc.template; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc; priority=8
+application/vnd.sun.xml.calc; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet"; nametemplate=%s.sxc; priority=8
+application/vnd.sun.xml.calc.template; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc; priority=8
#
###
@@ -38,9 +38,9 @@
###
# KDE 3 (obsolete)
-application/msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls; priority=3
-application/x-dbase; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
-text/x-csv; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
+application/msexcel; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls; priority=3
+application/x-dbase; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
+text/x-csv; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
#
###
diff -u openoffice.org-2.4.1/debian/changelog openoffice.org-2.4.1/debian/changelog
--- openoffice.org-2.4.1/debian/changelog
+++ openoffice.org-2.4.1/debian/changelog
@@ -1,3 +1,35 @@
+openoffice.org (1:2.4.1-10) unstable; urgency=medium
+
+ * ooo-build:
+ - update (r14164)
+ - more ko translation fixes
+ - sc-skip-overlapped-cells.diff: check the vadility of row numbers
+ (closes: #499374)
+ - math-draw-generic-name.diff: add GenericName for
+ Draw (closes: #498922) and Math (closes: #498924)
+ - cws-chart28.diff: backport from 2.4.2/3.0: fix crash when displaying
+ charts with clipped data
+ - soffice-remove-webwizard.diff: remove WebWizard remains from user
+ profile on starup if existing (closes: #360575) as that apparently
+ also is an issue in 2.x->2.x upgrades. Thanks Marc Haber for reminding
+ me...
+ - soffice-detect-mozilla-certificates.diff: only do a full find for
+ cert8.db when we don't find it with just maxdepth 2 (closes: #499062)
+ - unxsplash-rework.diff: don't run the external oosplash with -nologo
+ (no splash anyway) and with the (new) -no-oosplash
+ * debian/rules:
+ - also complain in binary-indep when Mono is disabled
+ - mkdir .../share/samples/<lang> in all langpacks (closes: #496047)
+ * debian/openoffice.org-report-builder-bin.overrides.lintian: fix
+ * debian/*.mime: run with -no-oosplash (closes: #396276)
+ * debian/control.in:
+ - make the openoffice.org metapackage depend on
+ openoffice.org-report-builder-bin as the libs contained there are
+ in the standard OOo install and the SRB needs it (even more when
+ installed not from the deb)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 02 Oct 2008 22:31:08 +0200
+
openoffice.org (1:2.4.1-9) unstable; urgency=medium
* debian/control.reportdesign.in:
diff -u openoffice.org-2.4.1/debian/control openoffice.org-2.4.1/debian/control
--- openoffice.org-2.4.1/debian/control
+++ openoffice.org-2.4.1/debian/control
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
diff -u openoffice.org-2.4.1/debian/rules openoffice.org-2.4.1/debian/rules
--- openoffice.org-2.4.1/debian/rules
+++ openoffice.org-2.4.1/debian/rules
@@ -1728,6 +1728,12 @@
> l10n.fdupes
debian/scripts/cleandupes --base=openoffice.org$(VER) --prefix=debian < l10n.fdupes
+ # they don't get created by the installer (or not copied?)
+ for iso in `echo $(LANGPACKISOS)`; do \
+ pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+ mkdir -p debian/openoffice.org$(VER)-l10n-$$pkgiso/$(OODIR)/share/samples/$$iso; \
+ done
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@ -2929,6 +2935,11 @@
echo "For uploads with binary-all packages, please use arches where Java is enabled!!!!!"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
+ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "For uploads with binary-all packages, please use arches where Mono is enabled!!!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+endif
dh_testdir
dh_testroot
diff -u openoffice.org-2.4.1/debian/openoffice.org-report-builder-bin.overrides.lintian openoffice.org-2.4.1/debian/openoffice.org-report-builder-bin.overrides.lintian
--- openoffice.org-2.4.1/debian/openoffice.org-report-builder-bin.overrides.lintian
+++ openoffice.org-2.4.1/debian/openoffice.org-report-builder-bin.overrides.lintian
@@ -1 +1 @@
-openoffice.org-report-builder: binary-or-shlib-defines-rpath
+openoffice.org-report-builder-bin: binary-or-shlib-defines-rpath
diff -u openoffice.org-2.4.1/debian/control.in openoffice.org-2.4.1/debian/control.in
--- openoffice.org-2.4.1/debian/control.in
+++ openoffice.org-2.4.1/debian/control.in
@@ -65,6 +65,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
+ openoffice.orgVER-report-builder-bin,
ttf-dejavu,
ttf-liberation,
${ooo-officebean-dep},
diff -u openoffice.org-2.4.1/debian/openoffice.org-impress.mime openoffice.org-2.4.1/debian/openoffice.org-impress.mime
--- openoffice.org-2.4.1/debian/openoffice.org-impress.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-impress.mime
@@ -2,23 +2,23 @@
# shared-mime-info
# ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm; priority=3
-application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm; priority=3
-application/vnd.ms-powerpoint.template.macroEnabled.12; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template with Macros Enabled"; nametemplate=%s.potm; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.presentation; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation"; nametemplate=%s.pptx; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.slideshow; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx; priority=3
-application/vnd.openxmlformats-officedocument.presentationml.template; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; nametemplate=%s.potx; priority=3
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm; priority=3
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm; priority=3
+application/vnd.ms-powerpoint.template.macroEnabled.12; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template with Macros Enabled"; nametemplate=%s.potm; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.presentation; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation"; nametemplate=%s.pptx; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.slideshow; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.template; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; nametemplate=%s.potx; priority=3
# Microsoft PowerPoint
-application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
+application/vnd.ms-powerpoint; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.presentation; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation"; nametemplate=%s.odp; priority=9
-application/vnd.oasis.opendocument.presentation-template; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation Template"; nametemplate=%s.otp; priority=9
+application/vnd.oasis.opendocument.presentation; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation"; nametemplate=%s.odp; priority=9
+application/vnd.oasis.opendocument.presentation-template; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation Template"; nametemplate=%s.otp; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.impress; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation"; nametemplate=%s.sxi; priority=8
-application/vnd.sun.xml.impress.template; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation Template"; nametemplate=%s.sti; priority=8
+application/vnd.sun.xml.impress; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation"; nametemplate=%s.sxi; priority=8
+application/vnd.sun.xml.impress.template; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation Template"; nametemplate=%s.sti; priority=8
#
###
@@ -26,7 +26,7 @@
###
# KDE 3 (Obsolete)
-application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
+application/mspowerpoint; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt; priority=3
#
###
diff -u openoffice.org-2.4.1/debian/openoffice.org-filter-binfilter.mime openoffice.org-2.4.1/debian/openoffice.org-filter-binfilter.mime
--- openoffice.org-2.4.1/debian/openoffice.org-filter-binfilter.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-filter-binfilter.mime
@@ -2,13 +2,13 @@
# shared-mime-info
# StarDivision StarOffice 5.0
-application/vnd.stardivision.calc; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="StarCalc 5.0"; nametemplate=%s.sdc; priority=8
-application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="StarChart 5.0"; nametemplate=%s.sds; priority=8
-application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="StarDraw 5.0"; nametemplate=%s.sda; priority=8
-application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="StarImpress 5.0"; nametemplate=%s.sdd; priority=8
-application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math '%s'; test=test -n "$DISPLAY"; description="StarMath 5.0"; nametemplate=%s.sdf; priority=8
-application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl; priority=8
-application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0"; nametemplate=%s.sdw; priority=8
+application/vnd.stardivision.calc; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="StarCalc 5.0"; nametemplate=%s.sdc; priority=8
+application/vnd.stardivision.chart; soffice -no-oosplash -calc '%s'; edit=soffice -no-oosplash -calc '%s'; test=test -n "$DISPLAY"; description="StarChart 5.0"; nametemplate=%s.sds; priority=8
+application/vnd.stardivision.draw; soffice -no-oosplash -draw '%s'; edit=soffice -no-oosplash -draw '%s'; test=test -n "$DISPLAY"; description="StarDraw 5.0"; nametemplate=%s.sda; priority=8
+application/vnd.stardivision.impress; soffice -no-oosplash -impress '%s'; edit=soffice -no-oosplash -impress '%s'; test=test -n "$DISPLAY"; description="StarImpress 5.0"; nametemplate=%s.sdd; priority=8
+application/vnd.stardivision.math; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="StarMath 5.0"; nametemplate=%s.sdf; priority=8
+application/vnd.stardivision.writer-global; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl; priority=8
+application/vnd.stardivision.writer; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0"; nametemplate=%s.sdw; priority=8
#
###
diff -u openoffice.org-2.4.1/debian/openoffice.org-base.mime openoffice.org-2.4.1/debian/openoffice.org-base.mime
--- openoffice.org-2.4.1/debian/openoffice.org-base.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-base.mime
@@ -2,10 +2,10 @@
# shared-mime-info
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.database; soffice -base '%s'; edit=soffice -base '%s'; test=test -n "$DISPLAY"; description="OpenDocument Database"; nametemplate=%s.odb; priority=9
+application/vnd.oasis.opendocument.database; soffice -no-oosplash -base '%s'; edit=soffice -no-oosplash -base '%s'; test=test -n "$DISPLAY"; description="OpenDocument Database"; nametemplate=%s.odb; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.base; soffice -writer '%s'; edit=soffice -writer '%s'; description="OpenOffice.org Database"; nametemplate=%s.sdb; priority=8
+application/vnd.sun.xml.base; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Database"; nametemplate=%s.sdb; priority=8
#
###
diff -u openoffice.org-2.4.1/debian/openoffice.org-math.mime openoffice.org-2.4.1/debian/openoffice.org-math.mime
--- openoffice.org-2.4.1/debian/openoffice.org-math.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-math.mime
@@ -2,13 +2,13 @@
# shared-mime-info
# Generic
-text/mathml; soffice -math '%s'; edit=soffice -math '%s'; test=test -n "$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml; priority=3
+text/mathml; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml; priority=3
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.formula; soffice -math '%s'; edit=soffice -math '%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula"; nametemplate=%s.odf; priority=9
+application/vnd.oasis.opendocument.formula; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula"; nametemplate=%s.odf; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.math; soffice -math '%s'; edit=soffice -math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Formula"; nametemplate=%s.sxm; priority=8
+application/vnd.sun.xml.math; soffice -no-oosplash -math '%s'; edit=soffice -no-oosplash -math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Formula"; nametemplate=%s.sxm; priority=8
#
###
diff -u openoffice.org-2.4.1/debian/openoffice.org-writer.mime openoffice.org-2.4.1/debian/openoffice.org-writer.mime
--- openoffice.org-2.4.1/debian/openoffice.org-writer.mime
+++ openoffice.org-2.4.1/debian/openoffice.org-writer.mime
@@ -2,35 +2,35 @@
# shared-mime-info
# Generic
-application/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
-application/x-extension-txt; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt; priority=3
-application/x-t602; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602; priority=3
+application/rtf; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
+application/x-extension-txt; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt; priority=3
+application/x-t602; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602; priority=3
# Corel WordPerfect
-application/vnd.wordperfect; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp; priority=3
+application/vnd.wordperfect; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp; priority=3
# ECMA Office Open XML (Microsoft Office 2007)
-application/vnd.ms-word.document.macroEnabled.12; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document with Macros Enabled"; nametemplate=%s.docm; priority=3
-application/vnd.ms-word.template.macroEnabled.12; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template with Macros Enabled"; nametemplate=%s.dotm; priority=3
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document"; nametemplate=%s.docx; priority=3
-application/vnd.openxmlformats-officedocument.wordprocessingml.template; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template"; nametemplate=%s.dotx; priority=3
+application/vnd.ms-word.document.macroEnabled.12; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document with Macros Enabled"; nametemplate=%s.docm; priority=3
+application/vnd.ms-word.template.macroEnabled.12; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template with Macros Enabled"; nametemplate=%s.dotm; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document"; nametemplate=%s.docx; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.template; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template"; nametemplate=%s.dotx; priority=3
# Microsoft Word
-application/msword; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc; priority=3
+application/msword; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc; priority=3
# Microsoft Works
-application/vnd.ms-works; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Works Document"; nametemplate=%s.wps; priority=3
+application/vnd.ms-works; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Works Document"; nametemplate=%s.wps; priority=3
# OASIS OpenDocument Format
-application/vnd.oasis.opendocument.text; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; nametemplate=%s.odt; priority=9
-application/vnd.oasis.opendocument.text-master; soffice -global '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master Document"; nametemplate=%s.odm; priority=9
-application/vnd.oasis.opendocument.text-template; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document Template"; nametemplate=%s.ott; priority=9
-application/vnd.oasis.opendocument.text-web; soffice -web '%s'; edit=soffice -web '%s'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth; priority=9
+application/vnd.oasis.opendocument.text; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; nametemplate=%s.odt; priority=9
+application/vnd.oasis.opendocument.text-master; soffice -no-oosplash -global '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master Document"; nametemplate=%s.odm; priority=9
+application/vnd.oasis.opendocument.text-template; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document Template"; nametemplate=%s.ott; priority=9
+application/vnd.oasis.opendocument.text-web; soffice -no-oosplash -web '%s'; edit=soffice -no-oosplash -web '%s'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth; priority=9
# OpenOffice.org 1.0
-application/vnd.sun.xml.writer; soffice -writer '%s'; edit=soffice -writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw; priority=8
-application/vnd.sun.xml.writer.global; soffice -global '%s'; edit=soffice -writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg; priority=8
-application/vnd.sun.xml.writer.template; soffice -writer '%s'; edit=soffice -writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw; priority=8
+application/vnd.sun.xml.writer; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw; priority=8
+application/vnd.sun.xml.writer.global; soffice -no-oosplash -global '%s'; edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg; priority=8
+application/vnd.sun.xml.writer.template; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw; priority=8
#
###
@@ -38,9 +38,9 @@
###
# KDE 3 (Obsolete)
-application/wordperfect; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp; priority=3
-text/plain; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt; priority=3
-text/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
+application/wordperfect; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp; priority=3
+text/plain; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt; priority=3
+text/rtf; soffice -no-oosplash -writer '%s'; edit=soffice -no-oosplash -writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
#
###
only in patch2:
unchanged:
--- openoffice.org-2.4.1.orig/ooo-build/patches/src680/math-draw-generic-name.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/math-draw-generic-name.diff
@@ -0,0 +1,33 @@
+Index: desktop/menus/math.desktop
+===================================================================
+--- sysui/desktop/menus/math.desktop (Revision 261918)
++++ sysui/desktop/menus/math.desktop (Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -math %U
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+ Name=%PRODUCTNAME Math
++GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
+Index: desktop/menus/draw.desktop
+===================================================================
+--- sysui/desktop/menus/draw.desktop (Revision 261918)
++++ sysui/desktop/menus/draw.desktop (Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -draw %U
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+ Name=%PRODUCTNAME Draw
++GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
+Index: desktop/share/launcher_genericname.ulf
+===================================================================
+--- sysui/desktop/share/launcher_genericname.ulf (Revision 261918)
++++ sysui/desktop/share/launcher_genericname.ulf (Arbeitskopie)
+@@ -10,3 +10,8 @@
+ [base]
+ en-US = "Database Development"
+
++[math]
++en-US = "Formula Editor"
++
++[draw]
++en-US = "Drawing Program"
only in patch2:
unchanged:
--- openoffice.org-2.4.1.orig/ooo-build/patches/src680/soffice-remove-webwizard.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/soffice-remove-webwizard.diff
@@ -0,0 +1,25 @@
+Index: scripts/soffice.sh
+===================================================================
+RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
+retrieving revision 1.28.48.1
+diff -u -r1.28.48.1 soffice.sh
+--- desktop/scripts/soffice.sh 2 Jan 2008 14:47:34 -0000 1.28.48.1
++++ desktop/scripts/soffice.sh 23 Sep 2008 10:47:17 -0000
+@@ -364,6 +364,17 @@
+ sd_binary="oosplash.bin"
+ fi
+
++# Fix for bug #mdv41228 #i89207
++# Remove this line:
++# <library:library library:name="WebWizard" xlink:href="file:///usr/lib/openoffice/share/basic/WebWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="true"/>
++# from files below.
++# Since 2007.0 WebWizard does not exist anymore.
++dialog_xlc=~/.openoffice.org2/user/basic/dialog.xlc
++script_xlc=~/.openoffice.org2/user/basic/script.xlc
++if [[ -f $dialog_xlc && -f $script_xlc ]]; then
++ sed -i "s/.*library:name=\"WebWizard\".*openoffice.*//" $dialog_xlc $script_xlc
++fi
++
+ # execute soffice binary
+ "$sd_prog/$sd_binary" "$@" &
+ trap 'kill -9 $!' TERM
only in patch2:
unchanged:
--- openoffice.org-2.4.1.orig/ooo-build/patches/src680/math-draw-generic-name-localize.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/math-draw-generic-name-localize.diff
@@ -0,0 +1,13 @@
+Index: desktop/share/localize.sdf
+===================================================================
+--- sysui/desktop/share/localize.sdf (Revision 261918)
++++ sysui/desktop/share/localize.sdf (Arbeitskopie)
+@@ -3102,6 +3102,8 @@
+ sysui desktop\share\launcher_genericname.ulf 0 LngText writer 0 vi Xử lý từ 2002-02-02 02:02:02
+ sysui desktop\share\launcher_genericname.ulf 0 LngText writer 0 zh-CN 字处理器 2002-02-02 02:02:02
+ sysui desktop\share\launcher_genericname.ulf 0 LngText writer 0 zh-TW 文書處理器 2002-02-02 02:02:02
++sysui desktop\share\launcher_genericname.ulf 0 LngText math 0 de Formeleditor 2002-02-02 02:02:02
++sysui desktop\share\launcher_genericname.ulf 0 LngText draw 0 de Zeichenprogramm 2002-02-02 02:02:02
+ sysui desktop\share\launcher_name.ulf 0 LngText printeradmin 0 af %PRODUCTNAME-drukkeradministrasie 2002-02-02 02:02:02
+ sysui desktop\share\launcher_name.ulf 0 LngText printeradmin 0 ar إدارة طابعات %PRODUCTNAME 2002-02-02 02:02:02
+ sysui desktop\share\launcher_name.ulf 0 LngText printeradmin 0 as-IN %PRODUCTNAME মুদ্ৰক প্ৰশাসন 2002-02-02 02:02:02
only in patch2:
unchanged:
--- openoffice.org-2.4.1.orig/ooo-build/patches/src680/cws-chart28.diff
+++ openoffice.org-2.4.1/ooo-build/patches/src680/cws-chart28.diff
@@ -0,0 +1,18 @@
+? cws-chart28.diff
+Index: source/view/main/Clipping.cxx
+===================================================================
+RCS file: /cvs/graphics/chart2/source/view/main/Clipping.cxx,v
+retrieving revision 1.6.82.1
+retrieving revision 1.6.82.1.10.1
+diff -u -r1.6.82.1 -r1.6.82.1.10.1
+--- chart2/source/view/main/Clipping.cxx 10 Jan 2008 17:14:29 -0000 1.6.82.1
++++ chart2/source/view/main/Clipping.cxx 3 Jun 2008 17:37:38 -0000 1.6.82.1.10.1
+@@ -182,7 +182,7 @@
+ rPoly.SequenceX.realloc(nPolygonIndex+1);
+ rPoly.SequenceY.realloc(nPolygonIndex+1);
+ rPoly.SequenceZ.realloc(nPolygonIndex+1);
+- rResultPointCount.push_back(0);
++ rResultPointCount.resize(nPolygonIndex+1,0);
+ }
+
+ drawing::DoubleSequence* pOuterSequenceX = &rPoly.SequenceX.getArray()[nPolygonIndex];
Reply to: