[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/pptx-filter-as-a-separate-lib.diff |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit fb08b3f60135d2d7dfe3959a7d168a7510e07529
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 13:56:55 2009 +0300

    Adapt pptx-filter-as-a-separate-lib.diff for dev300-m54
    
    * patches/dev300/pptx-filter-as-a-separate-lib.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/pptx-filter-as-a-separate-lib.diff b/patches/dev300/pptx-filter-as-a-separate-lib.diff
index 414ff5d..d04f035 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib.diff
@@ -1,24 +1,20 @@
-diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
-index f731f78..0990ba8 100644
 --- scp2/source/ooo/file_ooo.scp
 +++ scp2/source/ooo/file_ooo.scp
 @@ -361,6 +361,8 @@ STD_FILTER_FILE( gid_File_Filter_Eme, eme)
  
- STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+ STD_UNO_LIB_FILE( gid_File_Lib_Pptx, pptx )
  
 +STD_UNO_LIB_FILE( gid_File_Lib_Pptx, pptx )
 +
  STD_FILTER_FILE( gid_File_Filter_Icg, icg)
  
  STD_FILTER_FILE( gid_File_Filter_Egi, egi)
-diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
-index 08f3d34..2b93f24 100644
 --- scp2/source/ooo/module_hidden_ooo.scp
 +++ scp2/source/ooo/module_hidden_ooo.scp
 @@ -141,6 +141,7 @@ Module gid_Module_Root_Files_4
  	Files = (gid_File_Dat_Root4,
  	gid_File_Filter_Eme,
- 	gid_File_Filter_Sdfilt,
+ 	gid_File_Filter_Emp,
 +	gid_File_Filter_Pptx,
  	gid_File_Filter_Icg,
  	gid_File_Filter_Egi,
@@ -12690,13 +12686,11 @@ index 0000000..fe8616c
 +
 +} // namespace ppt;
 +
-diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
-index fb5e7af..08c64d0 100644
 --- sd/util/makefile.mk
 +++ sd/util/makefile.mk
 @@ -270,6 +270,36 @@ SHL5STDLIBS = $(ISDLIB) \
-               $(COMPHELPERLIB)    \
-               $(I18NISOLANGLIB)
+ SHL4DEPN=$(SHL1IMPLIBN)
+ .ENDIF
  
 +# pptx export library
 +SHL6TARGET    = pptx$(DLLPOSTFIX)