[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - scp2/source

Tor Lillqvist tml at kemper.freedesktop.org
Sat Nov 13 02:22:30 PST 2010


 scp2/source/ooo/file_ooo.scp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c29e8a56a7cd9ebb0fe862b1529b5ec93ceaa41
Merge: b7a2e72... f30dabc...
Author: Tor Lillqvist <tml at hemulen.(none)>
Date:   Fri Nov 12 15:07:13 2010 +0200

    Merge branch 'feature/pptx-export-ooxml11' into libreoffice-3-3

commit f30dabcd17a5abe61398c7ce08554e2ab4215041
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Nov 1 14:55:58 2010 +0200

    From hg changeset 11bdb9c019c49df77306d1a9915b44e1f8dbf79e in ooxml11
    
    ooxml11: intermediate commit

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d052261..002eef4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -345,7 +345,7 @@ End
 
 STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_UNO_LIB_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 


More information about the Libreoffice-commits mailing list