[Libreoffice-commits] .: Branch 'integration/dev300_m101' - scp2/source

[Thorsten Behrens]

 scp2/source/graphicfilter/file_graphicfilter.scp |    2 +-
 scp2/source/ooo/file_ooo.scp                     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 83c9f648c1302080e9393d965a302117c5a97a5f
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Mar 17 21:42:21 2011 +0100

    Fix ppt and wpg import
    
    There's no STD_UNO_LIB_FILE_PATCH anymore

diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ab46b18..eeac226 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,4 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
+STD_LIB_FILE( gid_File_Lib_WPGImport, wpgimport )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0c3392e..56cb070 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -314,9 +314,9 @@ File gid_File_Dtd_Toolbar
     Name = "toolbar.dtd";
 End
 
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)