[Libreoffice-commits] core.git: Branch 'aoo/trunk' - postprocess/packcomponents postprocess/prj scp2/source

[Andrea Pescetti]

 postprocess/packcomponents/makefile.mk |    1 -
 postprocess/prj/build.lst              |    2 +-
 scp2/source/writer/file_writer.scp     |    2 --
 scp2/source/writer/module_writer.scp   |    1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5188493226e3ef3a8aa26dbfa9790595c6a26553
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Fri May 1 17:20:22 2015 +0000

    #i126281# Do not build/ship hwpfilter.

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 4ef5f14..37657c3 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -121,7 +121,6 @@ my_components = \
     fps_office \
     frm \
     guesslang \
-    hwp \
     i18npool \
     i18nsearch \
     lng \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ce2a2f5..62aa24e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po      postprocess     ::      svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 2dd953bb1..be0d386 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -25,8 +25,6 @@
 
 STD_LIB_FILE( gid_File_Lib_Swd , swd)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
-
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 828dd92..9f246da 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -40,7 +40,6 @@ Module gid_Module_Prg_Wrt_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-    gid_File_Lib_Hwpreader,
     gid_File_Lib_Swd,
     gid_File_Lib_Swui,
     gid_File_Lib_Msword,