[Libreoffice-commits] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                                  |    5 --
 patches/dev300/layout-sc-insert-sheet-no.diff                         |   20 ----------
 patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff |   18 ---------
 3 files changed, 43 deletions(-)

New commits:
commit b6c56b69a0e69a4e372607d2c0cf83f60b538dd9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 20:38:34 2011 +0200

    bin obsolete scp2_extensions-gdocs_2.1.0_modified_installation.diff
    
    the prebuild gdocs_2.1.0_modified tarball is fixed now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2c0d135..8db5cba 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1371,9 +1371,6 @@ goodies-eps-filter-unix.diff, n#200053, rodo
 # internationalized ordinal suffix autocorrection. Needs ICU 4.2
 svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
 
-# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
-scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
-
 [ CT2NBits ]
 # ConvertTextToNumber extension build bits (fate#307906)
 ct2n-build.diff, pmladek
diff --git a/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff b/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff
deleted file mode 100644
index 39396ae..0000000
--- a/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- scp2/source/extensions/file_extensions.scp.old	2010-08-31 21:22:37.000000000 +0200
-+++ scp2/source/extensions/file_extensions.scp	2010-09-03 12:08:09.000000000 +0200
-@@ -186,7 +186,14 @@ End
- #ifdef WITH_EXTENSION_GOOGLE_DOCS
- 
- File gid_File_Oxt_Google_Docs
--    TXT_FILE_BODY;
-+/*  FIXME: gdocs_2.1.0_modified.oxt pack twice two files;
-+    it breaks installation with non-root user rights because
-+    the file can't be overwriten with unix rights 444
-+    => temporary using USER_FILE_BODY instead of TXT_FILE_BODY
-+    to set 644 user rights; can be removed if we update
-+    gdocs_*_modified.oxt
-+*/
-+    USER_FILE_BODY;
-     Styles = (PACKED, ARCHIVE);
-     Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
-     Name = "gdocs.oxt";
commit f79299fe82d0893f720da67292330769d7a79f6e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 20:34:08 2011 +0200

    pushed layout-sc-insert-sheet-no.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index db2df4b..2c0d135 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1339,8 +1339,6 @@ layout-fix-experimental-layout.diff, n#557230, thorsten
 layout-crash-fix.diff, n#557230, thorsten
 layout-listbox-minsize.diff, n#557230, thorsten
 layout-move-copy-fixed-height.diff, n#559438, thorsten
-# the input field for the number of the sheet was too small
-layout-sc-insert-sheet-no.diff, n#559445, pmladek
 # FIXME: temporary hack to build with layout disabled
 # is there a better fix?
 layout-disabled-layout-build-fix.diff, pmladek
diff --git a/patches/dev300/layout-sc-insert-sheet-no.diff b/patches/dev300/layout-sc-insert-sheet-no.diff
deleted file mode 100644
index 22fc30a..0000000
--- a/patches/dev300/layout-sc-insert-sheet-no.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sc/uiconfig/layout/insert-sheet.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sc/uiconfig/layout/insert-sheet.xml sc/uiconfig/layout/insert-sheet.xml
-index 2350da9..35a55e4 100644
---- sc/uiconfig/layout/insert-sheet.xml
-+++ sc/uiconfig/layout/insert-sheet.xml
-@@ -23,7 +23,7 @@
-             </vbox>
-             <vbox>
-             <hbox>
--                <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="false"/>
-+                <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="true"/>
-             </hbox>
-             <edit has_border="true" id="ED_TABNAME"  cnt:fill="true" cnt:expand="true"/>
-             </vbox>
--- 
-1.7.0.1
-