From e43a2abe325680390510df91c30f49974eaa8bb5 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 28 Jun 2006 15:37:52 +0000 Subject: [PATCH] INTEGRATION: CWS hcswriter01 (1.18.14); FILE MERGED 2006/06/13 12:56:36 ufi 1.18.14.7: makefiles 2006/06/12 13:50:33 ufi 1.18.14.6: border_page.xhp problem makefiles 2006/06/12 13:45:15 ufi 1.18.14.5: border_page.xhp problem 2006/05/30 09:11:38 ufi 1.18.14.4: *** empty log message *** 2006/05/30 07:33:26 ufi 1.18.14.3: *** empty log message *** 2006/03/24 13:42:56 ufi 1.18.14.2: *** empty log message *** 2006/02/16 13:18:17 ufi 1.18.14.1: make --- helpcontent2/util/swriter/makefile.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index 11217e45a7..491b1f7d10 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: vg $ $Date: 2006-05-23 16:05:30 $ +#* last change $Author: ihi $ $Date: 2006-06-28 16:37:52 $ #* -#* $Revision: 1.22 $ +#* $Revision: 1.23 $ #* #* $Logfile:$ #* @@ -297,6 +297,8 @@ LINKLINKFILES= \ text$/swriter$/guide$/auto_spellcheck.xhp \ text$/swriter$/guide$/autocorr_except.xhp \ text$/swriter$/guide$/autotext.xhp \ + text$/swriter$/guide$/border_object.xhp \ + text$/swriter$/guide$/border_page.xhp \ text$/swriter$/guide$/borders.xhp \ text$/swriter$/guide$/calculate.xhp \ text$/swriter$/guide$/calculate_clipboard.xhp \ @@ -318,6 +320,7 @@ LINKLINKFILES= \ text$/swriter$/guide$/fields_date.xhp \ text$/swriter$/guide$/fields_enter.xhp \ text$/swriter$/guide$/fields_userdata.xhp \ + text$/swriter$/guide$/finding.xhp \ text$/swriter$/guide$/footer_nextpage.xhp \ text$/swriter$/guide$/footer_pagenumber.xhp \ text$/swriter$/guide$/footnote_usage.xhp \ @@ -361,6 +364,7 @@ LINKLINKFILES= \ text$/swriter$/guide$/numbering_paras.xhp \ text$/swriter$/guide$/page_break.xhp \ text$/swriter$/guide$/pagebackground.xhp \ + text$/swriter$/guide$/pagenumbers.xhp \ text$/swriter$/guide$/pageorientation.xhp \ text$/swriter$/guide$/pagestyles.xhp \ text$/swriter$/guide$/para_style_quickuse.xhp \ @@ -1118,8 +1122,6 @@ LINKLINKFILES= \ text$/shared$/guide$/autocorr_url.xhp \ text$/shared$/guide$/autohide.xhp \ text$/shared$/guide$/background.xhp \ - text$/shared$/guide$/border_object.xhp \ - text$/shared$/guide$/border_page.xhp \ text$/shared$/guide$/border_paragraph.xhp \ text$/shared$/guide$/border_table.xhp \ text$/shared$/guide$/breaking_lines.xhp \