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

[Andras Timar]

 patches/dev300/apply                                  |    3 +++
 patches/dev300/helpcontent2-auxiliary-sharedtree.diff |   10 ++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit c75a170e3f045b089612b3040b28222464a350da
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Apr 17 22:55:35 2010 +0200

    removed a link to a non-existent topic in help
    
    * patches/dev300/apply:
    * patches/dev300/helpcontent2-auxiliary-sharedtree.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0e7f891..172aa27 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -504,6 +504,9 @@ helpcontent2-auxiliary-cfg.diff, pmladek
 # .. and add eu
 helpcontent2-auxiliary-eu.diff, i#108534
 
+# remove link to non-existent topic
+helpcontent2-auxiliary-sharedtree.diff, i#110963, timar
+
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek
 
diff --git a/patches/dev300/helpcontent2-auxiliary-sharedtree.diff b/patches/dev300/helpcontent2-auxiliary-sharedtree.diff
new file mode 100644
index 0000000..fd464a1
--- /dev/null
+++ b/patches/dev300/helpcontent2-auxiliary-sharedtree.diff
@@ -0,0 +1,10 @@
+--- helpcontent2/source/auxiliary/shared.tree.orig	2010-04-17 22:43:42.869750000 +0200
++++ helpcontent2/source/auxiliary/shared.tree	2010-04-17 22:44:01.901000000 +0200
+@@ -166,7 +166,6 @@
+ <topic id="shared/text/shared/guide/space_hyphen.xhp">Inserting Protected Spaces, Hyphens and Conditional Separators</topic>
+ <topic id="shared/text/shared/guide/insert_specialchar.xhp">Inserting Special Characters</topic>
+ <topic id="shared/text/shared/guide/tabs.xhp">Inserting and Editing Tab Stops</topic>
+-<topic id="shared/text/shared/guide/table_cellmerge.xhp">Merging and Splitting Cells</topic>
+ <topic id="shared/text/shared/guide/protection.xhp">Protecting Contents in %PRODUCTNAME</topic>
+ <topic id="shared/text/shared/guide/redlining_protect.xhp">Protecting Records</topic>
+ <topic id="shared/text/shared/guide/pageformat_max.xhp">Selecting the Maximum Printable Area on a Page</topic>