diff options
| author | Uwe Fischer <ufi@openoffice.org> | 2010-05-28 11:32:55 +0200 |
|---|---|---|
| committer | Uwe Fischer <ufi@openoffice.org> | 2010-05-28 11:32:55 +0200 |
| commit | 53c024f50eaa7488ca75945b4a66921f52074ecf (patch) | |
| tree | ec95807f470317978d2abd7bfc243db6543c3b02 /helpcontent2/source/auxiliary | |
| parent | 1b085e176d2f0dd6cd2bdba03ebadc21b03e027c (diff) | |
| parent | be6a147aa0a7f7d1567d001e9e5caab4c41ad27a (diff) | |
hcshared26: merge with DEV300_m79 second try
Diffstat (limited to 'helpcontent2/source/auxiliary')
| -rw-r--r-- | helpcontent2/source/auxiliary/makefile.mk | 2 | ||||
| -rwxr-xr-x | helpcontent2/source/auxiliary/shared.tree | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 93c8223af3..48b02b5d0e 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -91,7 +91,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done .ENDIF # "$(WITH_LANG)"!="" aux_dirs .PHONY : - echo aux_langdirs:=$(aux_langdirs) > $(INCCOM)$/aux_langs.mk + echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk $(COMMONBIN)$/helpimg.ilst .PHONY: -$(RM) $@ diff --git a/helpcontent2/source/auxiliary/shared.tree b/helpcontent2/source/auxiliary/shared.tree index 857fcab690..68c79835bf 100755 --- a/helpcontent2/source/auxiliary/shared.tree +++ b/helpcontent2/source/auxiliary/shared.tree @@ -110,7 +110,7 @@ </node> <node id="1012" title="Charts and Diagrams"> <topic id="shared/text/shared/guide/chart_insert.xhp">Inserting Charts</topic> -<topic id="schart/text/schart/main0000.xhp">Using Charts</topic> +<topic id="schart/text/schart/main0000.xhp">Using Charts</topic> </node> <node id="1013" title="Load, Save, Import, Export"> <topic id="shared/text/shared/guide/doc_open.xhp">Opening Documents</topic> @@ -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> |