[Libreoffice-commits] .: Branch 'feature/killsdf' - 103 commits - accessibility/bridge accessibility/inc accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk accessibility/Makefile accessibility/source animations/Library_animcore.mk apache-commons/Module_apache_commons.mk apache-commons/Module_apache-commons.mk apple_remote/Library_AppleRemote.mk avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk avmedia/Module_avmedia.mk basctl/Library_basctl.mk basctl/source basebmp/CppunitTest_basebmp.mk basebmp/Library_basebmp.mk basebmp/StaticLibrary_basebmp.mk basegfx/CppunitTest_basegfx.mk basegfx/Library_basegfx.mk basic/CppunitTest_basic_enable.mk basic/CppunitTest_basic_nested_struct.mk basic/CppunitTest_basic_scanner.mk basic/Library_sb.mk basic/source bean/Library_officebean.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmars hal.mk binaryurp/Library_binaryurp.mk boost/boost.6397.warnings.patch bridges/Library_gcc3_aix_powerpc.mk bridges/Library_gcc3_ios_arm.mk bridges/Library_gcc3_linux_alpha.mk bridges/Library_gcc3_linux_arm.mk bridges/Library_gcc3_linux_hppa.mk bridges/Library_gcc3_linux_ia64.mk bridges/Library_gcc3_linux_intel.mk bridges/Library_gcc3_linux_m68k.mk bridges/Library_gcc3_linux_mips.mk bridges/Library_gcc3_linux_powerpc64.mk bridges/Library_gcc3_linux_powerpc.mk bridges/Library_gcc3_linux_s390.mk bridges/Library_gcc3_linux_s390x.mk bridges/Library_gcc3_linux_sparc.mk bridges/Library_gcc3_linux_x86-64.mk bridges/Library_gcc3_solaris_intel.mk bridges/Library_gcc3_solaris_sparc.mk bridges/Library_java_uno.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk clucene/Library_clucene.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk comphelper/CppunitTest_comphelper_test.mk comphelper/Library_comphelper.mk comphelper/source config_host.mk.in configmgr/Library_configmgr.mk configure.in connectivity/Library_ado.mk connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Library_macab1.mk connectivity/Library_macabdrv1.mk connectivity/Library_mork.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozab.mk connectivity/Library_mozbootstrap.mk connec tivity/Library_mysql.mk connectivity/Library_odbcbase.mk connectivity/Library_odbc.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/Library_sdbc2.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk connectivity/source cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/CppunitTest_cppu_checkapi.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/CppunitTest_cppuhelper_checkapi.mk cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk cppuhelper/CppunitTest_cppuhelper_qa_weak.mk cppuhelper/Library_cppuhelper.mk cppu/inc cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cpputools/Executable_regcomp.mk cpputools/Executable_reg singleton.mk cpputools/Executable_uno.mk crashrep/source cross_tail_build/prj cui/Library_cui.mk cui/source dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/Executable_odbcconfig.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/Makefile dbaccess/qa dbaccess/source desktop/Executable_crashrep.com.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice_bin.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unopkg.bin.mk desktop/inc desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migration oo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk desktop/source drawinglayer/Library_drawinglayer.mk dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtrans.mk editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/CppunitTest_editeng_lookuptree.mk editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Makefile embeddedobj/qa embeddedobj/source embeddedobj/test embeddedobj/util embedserv/Library_emser.mk embedserv/Library_inprocserv.mk eventattacher/Library_evtatt.mk extensions/CppunitTest_extensions_test_update.mk extensions/Executable_nsplugin.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_npsoplugin.mk extensions/Library_oleautob ridge2.mk extensions/Library_oleautobridge.mk extensions/Library_OOoSpotlightImporter.mk extensions/Library_pcr.mk extensions/Library_pl.mk extensions/Library_res.mk extensions/Library_scn.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updchk.mk extensions/source extras/source fileaccess/Library_fileacc.mk fileaccess/source filter/CppunitTest_filter_pict_test.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk filter/Executable_svg2odf.mk filter/Library_egi.mk filter/Library_eme.mk filter/Library_epb.mk filter/Library_epg.mk filter/Library_epp.mk filter/Library_eps.mk filter/Library_ept.mk filter/Library_era.mk filter/Library_eti.mk filter/Library_exp.mk filter/Library_filterconfig.mk filter/Library_flash.mk filter/Library_icd.mk filter/Library_icg.mk filter/Library_idx.mk filter/Library_ime.mk filter/Library_ipb.mk filter/Library_ipd.mk filter/Library_ips.mk filter/Library_ipt.mk filter/Library_ipx.mk filter/Library_ira.mk filter/Library_itg.mk filter/Library_iti.mk filter/Library_msfilter.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_placeware.mk filter/Library_PptImporter.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_textfd.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk filter/source forms/Library_frm.mk formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_odma.mk fpicker/Library_fps_office.mk framework/inc framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Library_lomenubar.mk framework/source graphite/README hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/CppunitTest_i18npool_test_charactercla ssification.mk i18npool/CppunitTest_i18npool_test_languagetag.mk i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18npool/source i18nutil/Library_i18nutil.mk idl/Executable_svidl.mk io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk jurt/Library_jpipe.mk jurt/Library_jpipx.mk jvmaccess/Lib rary_jvmaccess.mk jvmfwk/Executable_javaldx.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk l10ntools/Executable_ulfconv.mk l10ntools/inc l10ntools/Makefile l10ntools/scripts l10ntools/source Library_merged.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk lingucomponent/StaticLibrary_ulingu.mk linguistic/Library_lng.mk linguistic/source lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk lotuswordpro/source lotuswordpro/util Makefile.top Module_cross_tail_build.mk Module_tail_build.mk neon/Library_neon.mk o3tl/CppunitTest_o3tl_tests.mk officecfg/CppunitTest_officecfg_cppheader_test.mk ooo.lst.in oox/Library_oox.mk oox/source package/Library_package2.mk package/Library_xstor.mk padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk postprocess/packcomponents pyuno/Library_pyuno_wrapper.mk regexp/Library_re gexp.mk registry/Library_reg.mk remotebridges/Library_uuresolver.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk reportdesign/source RepositoryExternal.mk RepositoryFixes.mk Repository.mk rsc/Executable_rsc.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_checkapi.mk sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_mutex.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_osl_pipe.mk sal/CppunitTest_sal_osl_process.mk sal/CppunitTest_sal_osl_profile.mk sal/CppunitTest_sal_osl_security.mk sal/CppunitTest_sal_osl_setthreadname.mk sal/CppunitTest_sal_osl_thread.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc32.mk sal/CppunitTest_sal_rtl_doublelock.mk sal/CppunitTest_sal_rtl_locale.mk sal/CppunitTest_sal_rtl _math.mk sal/CppunitTest_sal_rtl_ostringbuffer.mk sal/CppunitTest_sal_rtl_oustringbuffer.mk sal/CppunitTest_sal_rtl_strings.mk sal/CppunitTest_sal_rtl_uri.mk sal/CppunitTest_sal_rtl_uuid.mk sal/CppunitTest_sal_tcwf.mk sal/CppunitTest_sal_types.mk sal/Executable_cppunittester.mk sal/Executable_osl_process_child.mk salhelper/CppunitTest_salhelper_checkapi.mk salhelper/Library_salhelper.mk sal/Library_lo-bootstrap.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sax/CppunitTest_sax.mk sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk saxon/build.xml saxon/ExternalProject_saxon.mk saxon/Makefile saxon/makefile.mk saxon/Module_saxon.mk saxon/Package_saxon.mk saxon/prj saxon/saxon-9.0.0.7-bj.patch saxon/UnpackedTarball_saxon.mk sax/StaticLibrary_sax_shared.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sccomp/Library_solver.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression _test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.mk scp2/InstallModule_ooo.mk scp2/source sc/qa scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk scripting/source sc/sdi sc/source sd/CppunitTest_sd_fi lters_test.mk sd/CppunitTest_sd_regression_test.mk sd/CppunitTest_sd_uimpress.mk sdext/CppunitTest_pdfimport.mk sdext/CustomTarget_presenter.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/source sdext/StaticLibrary_pdfimport_s.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/source sfx2/CppunitTest_sfx2_metadatable.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/source shell/Executable_gnome_open_url.mk shell/Executable_lngconvex.mk shell/Executable_senddoc.mk shell/Library_cmdmail.mk shell/Library_desktopbe.mk shell/Library_gconfbe.mk shell/Library_kde4be.mk shell/Library_kdebe.mk shell/Library_localebe.mk shell/Library_macbe.mk shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_recentfile.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/Library_smplmail.mk shell/Library_syssh.mk shell/Library_syssh_win.mk shell/Library_tdebe.mk shel l/Library_wininetbe.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk solenv/bin solenv/gbuild solenv/inc soltools/adjustvisibility soltools/checkdll soltools/cpp soltools/Executable_adjustvisibility.mk soltools/Executable_checkdll.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_ldump4.mk soltools/Executable_makedepend.mk soltools/giparser soltools/inc soltools/javadep soltools/ldump soltools/Makefile soltools/mkdepend soltools/Module_soltools.mk soltools/Package_inc.mk soltools/prj soltools/support soltools/testhxx soltools/util soltools/winunistd sot/CppunitTest_sot_test_sot.mk sot/Library_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_smd.mk starmath/Library_sm.mk stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_nami ngservice.mk stoc/Library_proxyfac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk store/Library_store.mk svl/CppunitTest_svl_lngmisc.mk svl/CppunitTest_svl_urihelper.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svl/source svtools/CppunitTest_svtools_filters_test.mk svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/Executable_langsupport.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svtools/source svx/Executable_gengal.bin.mk svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/sdi svx/source sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_regression_test.mk sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_odfimport.mk sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw /CppunitTest_sw_subsequent_rtfimport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8import.mk sw/CppunitTest_sw_swdoc_test.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/qa sw/source tail_build/prj test/Library_subsequenttest.mk test/Library_test.mk testtools/StaticLibrary_bridgetest.mk tomcat/build.xml tomcat/ExternalProject_tomcat.mk tomcat/Makefile tomcat/Module_tomcat.mk tomcat/Package_tomcat.mk tomcat/prj tomcat/tomcat.patch tomcat/UnpackedTarball_tomcat.mk toolkit/Library_tk.mk tools/CppunitTest_tools_test.mk tools/Executable_bestreversemap.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Library_tl.mk touch/Library_libotouch.mk tubes/CppunitTest_tubes_test.mk tubes/Library_tubes.mk ucbhelper/Library_ucbhelper.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_u cpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucpodma1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk ucb/source ucpp/Makefile udm/StaticLibrary_udm.mk UnoControls/Library_ctl.mk unotest/Library_unobootstrapprotector.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotools/Library_utl.mk unotools/source unoxml/Library_unordf.mk unoxml/Library_unoxml.mk uui/Library_uui.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vbahelper/source vcl/aqua vcl/Executable_kdefilepicker.mk vcl/Executable_tdefilepicker.mk vcl/Executable_ui-previewer.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk vcl/source vcl/StaticLibrary_headless.mk vcl/St aticLibrary_vclmain.mk writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerfilter/source writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftwriter.mk writerperfect/StaticLibrary_writerperfect.mk xml2cmp/Executable_xml2cmp.mk xmlhelp/source xmloff/Library_xof.mk xmloff/Library_xo.mk xmloff/source xmlreader/Library_xmlreader.mk xmlscript/Library_xmlscript.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 1 04:59:00 PDT 2012
Library_merged.mk | 36
Makefile.top | 12
Module_cross_tail_build.mk | 4
Module_tail_build.mk | 261 +-
Repository.mk | 6
RepositoryExternal.mk | 109 -
RepositoryFixes.mk | 6
UnoControls/Library_ctl.mk | 2
accessibility/Library_acc.mk | 2
accessibility/Library_java_uno_accessbridge.mk | 2
accessibility/Makefile | 7
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component | 43
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx | 37
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 37
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 37
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 37
accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx | 37
accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx | 37
accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx | 37
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx | 37
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 37
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 37
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 37
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 37
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 37
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 37
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 37
accessibility/source/extended/AccessibleGridControl.cxx | 37
accessibility/source/extended/AccessibleGridControlBase.cxx | 37
accessibility/source/extended/AccessibleGridControlHeader.cxx | 37
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 37
accessibility/source/extended/AccessibleGridControlTable.cxx | 37
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 37
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 37
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 36
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 36
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 36
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 37
accessibility/source/extended/accessibleiconchoicectrl.cxx | 37
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 37
accessibility/source/extended/accessiblelistboxentry.cxx | 37
accessibility/source/extended/accessibletabbar.cxx | 37
accessibility/source/extended/accessibletabbarpage.cxx | 37
accessibility/source/extended/accessibletabbarpagelist.cxx | 37
accessibility/source/extended/accessibletablistbox.cxx | 37
accessibility/source/extended/accessibletablistboxtable.cxx | 37
accessibility/source/extended/textwindowaccessibility.cxx | 37
accessibility/source/helper/acc_factory.cxx | 37
accessibility/source/helper/accresmgr.cxx | 37
accessibility/source/helper/characterattributeshelper.cxx | 37
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 37
accessibility/source/standard/vclxaccessiblebox.cxx | 37
accessibility/source/standard/vclxaccessiblebutton.cxx | 37
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 37
accessibility/source/standard/vclxaccessiblecombobox.cxx | 37
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx | 37
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx | 37
accessibility/source/standard/vclxaccessibleedit.cxx | 37
accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx | 37
accessibility/source/standard/vclxaccessiblefixedtext.cxx | 37
accessibility/source/standard/vclxaccessiblelistbox.cxx | 37
accessibility/source/standard/vclxaccessiblelistitem.cxx | 37
accessibility/source/standard/vclxaccessiblemenu.cxx | 37
accessibility/source/standard/vclxaccessiblemenubar.cxx | 37
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 37
accessibility/source/standard/vclxaccessiblemenuseparator.cxx | 37
accessibility/source/standard/vclxaccessiblepopupmenu.cxx | 37
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 37
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 37
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 37
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 37
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 37
accessibility/source/standard/vclxaccessibletabpage.cxx | 37
accessibility/source/standard/vclxaccessibletextfield.cxx | 37
accessibility/source/standard/vclxaccessibletoolbox.cxx | 37
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 37
animations/Library_animcore.mk | 2
apache-commons/Module_apache-commons.mk | 31
apache-commons/Module_apache_commons.mk | 32
apple_remote/Library_AppleRemote.mk | 17
avmedia/Library_avmedia.mk | 2
avmedia/Library_avmediaQuickTime.mk | 10
avmedia/Library_avmediagst.mk | 2
avmedia/Library_avmediagst_0_10.mk | 2
avmedia/Library_avmediawin.mk | 12
avmedia/Module_avmedia.mk | 2
basctl/Library_basctl.mk | 4
basctl/source/basicide/baside3.cxx | 17
basctl/source/basicide/basides3.cxx | 6
basctl/source/basicide/moduldlg.cxx | 7
basctl/source/basicide/scriptdocument.cxx | 5
basctl/source/dlged/dlged.cxx | 12
basctl/source/dlged/propbrw.cxx | 4
basebmp/CppunitTest_basebmp.mk | 2
basebmp/Library_basebmp.mk | 2
basebmp/StaticLibrary_basebmp.mk | 2
basegfx/CppunitTest_basegfx.mk | 2
basegfx/Library_basegfx.mk | 2
basic/CppunitTest_basic_enable.mk | 4
basic/CppunitTest_basic_nested_struct.mk | 4
basic/CppunitTest_basic_scanner.mk | 4
basic/Library_sb.mk | 5
basic/source/classes/eventatt.cxx | 33
basic/source/classes/sbunoobj.cxx | 96
basic/source/classes/sbxmod.cxx | 10
basic/source/uno/dlgcont.cxx | 28
basic/source/uno/namecont.cxx | 55
bean/Library_officebean.mk | 18
binaryurp/CppunitTest_binaryurp_test-cache.mk | 2
binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2
binaryurp/Library_binaryurp.mk | 2
boost/boost.6397.warnings.patch | 15
bridges/Library_gcc3_aix_powerpc.mk | 5
bridges/Library_gcc3_ios_arm.mk | 5
bridges/Library_gcc3_linux_alpha.mk | 5
bridges/Library_gcc3_linux_arm.mk | 10
bridges/Library_gcc3_linux_hppa.mk | 5
bridges/Library_gcc3_linux_ia64.mk | 5
bridges/Library_gcc3_linux_intel.mk | 10
bridges/Library_gcc3_linux_m68k.mk | 5
bridges/Library_gcc3_linux_mips.mk | 10
bridges/Library_gcc3_linux_powerpc.mk | 5
bridges/Library_gcc3_linux_powerpc64.mk | 5
bridges/Library_gcc3_linux_s390.mk | 5
bridges/Library_gcc3_linux_s390x.mk | 5
bridges/Library_gcc3_linux_sparc.mk | 5
bridges/Library_gcc3_linux_x86-64.mk | 5
bridges/Library_gcc3_solaris_intel.mk | 5
bridges/Library_gcc3_solaris_sparc.mk | 5
bridges/Library_java_uno.mk | 2
canvas/Library_cairocanvas.mk | 16
canvas/Library_canvasfactory.mk | 2
canvas/Library_canvastools.mk | 4
canvas/Library_directx9canvas.mk | 4
canvas/Library_gdipluscanvas.mk | 4
canvas/Library_nullcanvas.mk | 2
canvas/Library_simplecanvas.mk | 2
canvas/Library_vclcanvas.mk | 2
chart2/Library_chartcontroller.mk | 10
chart2/Library_chartcore.mk | 2
cli_ure/Executable_climaker.mk | 7
cli_ure/Library_cli_cppuhelper_native.mk | 7
cli_ure/Library_cli_uno.mk | 5
clucene/Library_clucene.mk | 15
codemaker/StaticLibrary_codemaker.mk | 1
codemaker/StaticLibrary_codemaker_cpp.mk | 1
codemaker/StaticLibrary_codemaker_java.mk | 1
comphelper/CppunitTest_comphelper_test.mk | 2
comphelper/Library_comphelper.mk | 2
comphelper/source/misc/componentcontext.cxx | 23
config_host.mk.in | 5
configmgr/Library_configmgr.mk | 2
configure.in | 20
connectivity/Library_ado.mk | 11
connectivity/Library_calc.mk | 2
connectivity/Library_dbase.mk | 2
connectivity/Library_dbpool2.mk | 2
connectivity/Library_dbtools.mk | 2
connectivity/Library_evoab.mk | 2
connectivity/Library_file.mk | 2
connectivity/Library_flat.mk | 2
connectivity/Library_hsqldb.mk | 2
connectivity/Library_jdbc.mk | 2
connectivity/Library_kab1.mk | 1
connectivity/Library_kabdrv1.mk | 1
connectivity/Library_macab1.mk | 1
connectivity/Library_macabdrv1.mk | 7
connectivity/Library_mork.mk | 2
connectivity/Library_mozab.mk | 2
connectivity/Library_mozabdrv.mk | 2
connectivity/Library_mozbootstrap.mk | 2
connectivity/Library_mysql.mk | 2
connectivity/Library_odbc.mk | 2
connectivity/Library_odbcbase.mk | 2
connectivity/Library_postgresql-sdbc-impl.mk | 4
connectivity/Library_postgresql-sdbc.mk | 3
connectivity/Library_sdbc2.mk | 2
connectivity/Library_tdeab1.mk | 1
connectivity/Library_tdeabdrv1.mk | 1
connectivity/source/drivers/postgresql/pq_driver.cxx | 23
connectivity/source/resource/sharedresources.cxx | 9
cppcanvas/Library_cppcanvas.mk | 2
cppcanvas/Library_mtfrenderer.mk | 2
cppu/CppunitTest_cppu_checkapi.mk | 2
cppu/CppunitTest_cppu_qa_any.mk | 2
cppu/CppunitTest_cppu_qa_recursion.mk | 2
cppu/CppunitTest_cppu_qa_reference.mk | 2
cppu/CppunitTest_cppu_qa_unotype.mk | 2
cppu/CppunitTest_cppu_test_cppumaker.mk | 2
cppu/Library_affine_uno.mk | 2
cppu/Library_cppu.mk | 2
cppu/Library_log_uno.mk | 2
cppu/Library_purpenvhelper.mk | 2
cppu/Library_unsafe_uno.mk | 2
cppu/inc/com/sun/star/uno/Reference.hxx | 6
cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 2
cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 2
cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2
cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 2
cppuhelper/Library_cppuhelper.mk | 2
cpputools/Executable_regcomp.mk | 2
cpputools/Executable_regsingleton.mk | 2
cpputools/Executable_uno.mk | 2
crashrep/source/win32/soreport.cpp | 2
cross_tail_build/prj/build.lst | 2
cui/Library_cui.mk | 4
cui/source/customize/cfg.cxx | 10
cui/source/customize/cfgutil.cxx | 6
cui/source/dialogs/scriptdlg.cxx | 9
cui/source/options/treeopt.cxx | 11
dbaccess/CppunitTest_dbaccess_macros_test.mk | 2
dbaccess/Executable_odbcconfig.mk | 2
dbaccess/Library_dba.mk | 2
dbaccess/Library_dbaxml.mk | 2
dbaccess/Library_dbmm.mk | 2
dbaccess/Library_dbu.mk | 4
dbaccess/Library_sdbt.mk | 2
dbaccess/Makefile | 7
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 46
dbaccess/source/core/api/KeySet.cxx | 38
dbaccess/source/ui/browser/dbtreeview.cxx | 37
dbaccess/source/ui/browser/unodatbr.cxx | 44
dbaccess/source/ui/querydesign/QTableWindow.cxx | 37
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 37
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 37
desktop/Executable_crashrep.com.mk | 2
desktop/Executable_officeloader.mk | 2
desktop/Executable_oosplash.mk | 1
desktop/Executable_quickstart.mk | 13
desktop/Executable_sbase.mk | 2
desktop/Executable_scalc.mk | 2
desktop/Executable_sdraw.mk | 2
desktop/Executable_simpress.mk | 2
desktop/Executable_smath.mk | 2
desktop/Executable_soffice.bin.mk | 2
desktop/Executable_soffice.mk | 5
desktop/Executable_soffice_bin.mk | 2
desktop/Executable_sweb.mk | 2
desktop/Executable_swriter.mk | 2
desktop/Executable_unopkg.bin.mk | 2
desktop/Library_deployment.mk | 2
desktop/Library_deploymentgui.mk | 4
desktop/Library_deploymentmisc.mk | 2
desktop/Library_migrationoo2.mk | 2
desktop/Library_migrationoo3.mk | 2
desktop/Library_offacc.mk | 3
desktop/Library_sofficeapp.mk | 2
desktop/Library_spl.mk | 2
desktop/Library_spl_unx.mk | 1
desktop/Library_unopkgapp.mk | 2
desktop/inc/app.hxx | 2
desktop/source/app/app.cxx | 5
desktop/source/app/appinit.cxx | 19
desktop/source/offacc/acceptor.cxx | 18
drawinglayer/Library_drawinglayer.mk | 2
dtrans/Library_dnd.mk | 10
dtrans/Library_dtrans.mk | 2
dtrans/Library_ftransl.mk | 10
dtrans/Library_mcnttype.mk | 2
dtrans/Library_sysdtrans.mk | 10
editeng/CppunitTest_editeng_borderline.mk | 2
editeng/CppunitTest_editeng_core.mk | 2
editeng/CppunitTest_editeng_lookuptree.mk | 2
editeng/Library_editeng.mk | 2
embeddedobj/Library_embobj.mk | 2
embeddedobj/Library_emboleobj.mk | 5
embeddedobj/Makefile | 7
embeddedobj/qa/embedding/makefile.mk | 33
embeddedobj/source/commonembedding/embedobj.cxx | 37
embeddedobj/source/commonembedding/inplaceobj.cxx | 37
embeddedobj/source/commonembedding/miscobj.cxx | 37
embeddedobj/source/commonembedding/persistence.cxx | 37
embeddedobj/source/commonembedding/register.cxx | 37
embeddedobj/source/commonembedding/specialobject.cxx | 37
embeddedobj/source/commonembedding/visobj.cxx | 37
embeddedobj/source/commonembedding/xfactory.cxx | 37
embeddedobj/source/general/docholder.cxx | 48
embeddedobj/source/general/dummyobject.cxx | 37
embeddedobj/source/general/intercept.cxx | 37
embeddedobj/source/general/xcreator.cxx | 37
embeddedobj/source/inc/commonembobj.hxx | 37
embeddedobj/source/inc/docholder.hxx | 37
embeddedobj/source/inc/dummyobject.hxx | 37
embeddedobj/source/inc/oleembobj.hxx | 37
embeddedobj/source/msole/closepreventer.cxx | 43
embeddedobj/source/msole/emboleobj.component | 43
embeddedobj/source/msole/emboleobj.windows.component | 43
embeddedobj/source/msole/graphconvert.cxx | 37
embeddedobj/source/msole/olecomponent.cxx | 37
embeddedobj/source/msole/oleembed.cxx | 37
embeddedobj/source/msole/olemisc.cxx | 37
embeddedobj/source/msole/olepersist.cxx | 37
embeddedobj/source/msole/oleregister.cxx | 37
embeddedobj/source/msole/olevisual.cxx | 37
embeddedobj/source/msole/ownview.cxx | 37
embeddedobj/source/msole/xdialogcreator.cxx | 37
embeddedobj/source/msole/xolefactory.cxx | 37
embeddedobj/test/Container1/nativelib/nativeview.c | 37
embeddedobj/test/MainThreadExecutor/register.cxx | 37
embeddedobj/test/MainThreadExecutor/xexecutor.cxx | 37
embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 37
embeddedobj/test/mtexecutor/bitmapcreator.cxx | 37
embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 37
embeddedobj/test/mtexecutor/mteregister.cxx | 37
embeddedobj/util/embobj.component | 43
embedserv/Library_emser.mk | 7
embedserv/Library_inprocserv.mk | 7
eventattacher/Library_evtatt.mk | 2
extensions/CppunitTest_extensions_test_update.mk | 4
extensions/Executable_nsplugin.mk | 42
extensions/Library_OOoSpotlightImporter.mk | 8
extensions/Library_abp.mk | 2
extensions/Library_bib.mk | 2
extensions/Library_dbp.mk | 2
extensions/Library_ldapbe2.mk | 2
extensions/Library_log.mk | 2
extensions/Library_npsoplugin.mk | 18
extensions/Library_oleautobridge.mk | 3
extensions/Library_oleautobridge2.mk | 3
extensions/Library_pcr.mk | 2
extensions/Library_pl.mk | 16
extensions/Library_res.mk | 2
extensions/Library_scn.mk | 6
extensions/Library_so_activex.mk | 8
extensions/Library_so_activex_x64.mk | 8
extensions/Library_updchk.mk | 2
extensions/source/nsplugin/source/so_instance.cxx | 7
extras/source/autotext/lang/pt-BR/acor/DocumentList.xml | 1
extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml | 34
fileaccess/Library_fileacc.mk | 2
fileaccess/source/FileAccess.cxx | 12
filter/CppunitTest_filter_pict_test.mk | 2
filter/CppunitTest_filter_tga_test.mk | 2
filter/CppunitTest_filter_tiff_test.mk | 2
filter/Executable_svg2odf.mk | 2
filter/Library_PptImporter.mk | 2
filter/Library_egi.mk | 2
filter/Library_eme.mk | 2
filter/Library_epb.mk | 2
filter/Library_epg.mk | 2
filter/Library_epp.mk | 2
filter/Library_eps.mk | 2
filter/Library_ept.mk | 2
filter/Library_era.mk | 2
filter/Library_eti.mk | 2
filter/Library_exp.mk | 2
filter/Library_filterconfig.mk | 2
filter/Library_flash.mk | 2
filter/Library_icd.mk | 2
filter/Library_icg.mk | 2
filter/Library_idx.mk | 2
filter/Library_ime.mk | 2
filter/Library_ipb.mk | 2
filter/Library_ipd.mk | 2
filter/Library_ips.mk | 2
filter/Library_ipt.mk | 2
filter/Library_ipx.mk | 2
filter/Library_ira.mk | 2
filter/Library_itg.mk | 2
filter/Library_iti.mk | 2
filter/Library_msfilter.mk | 2
filter/Library_odfflatxml.mk | 2
filter/Library_pdffilter.mk | 2
filter/Library_placeware.mk | 2
filter/Library_svgfilter.mk | 2
filter/Library_t602filter.mk | 2
filter/Library_textfd.mk | 2
filter/Library_xmlfa.mk | 2
filter/Library_xmlfd.mk | 2
filter/Library_xsltdlg.mk | 2
filter/Library_xsltfilter.mk | 4
filter/source/svg/svgfilter.component | 2
filter/source/svg/svgfilter.cxx | 2
filter/source/t602/filterenv.cxx | 4
filter/source/t602/t602filter.component | 2
filter/source/textfilterdetect/fdcomp.cxx | 2
filter/source/textfilterdetect/textfd.component | 2
filter/source/xsltfilter/XSLTFilter.cxx | 9
forms/Library_frm.mk | 2
formula/Library_for.mk | 2
formula/Library_forui.mk | 2
fpicker/Library_fpicker.mk | 2
fpicker/Library_fps.mk | 5
fpicker/Library_fps_aqua.mk | 7
fpicker/Library_fps_odma.mk | 2
fpicker/Library_fps_office.mk | 2
framework/Library_fwe.mk | 2
framework/Library_fwi.mk | 4
framework/Library_fwk.mk | 2
framework/Library_fwl.mk | 2
framework/Library_fwm.mk | 2
framework/Library_lomenubar.mk | 6
framework/inc/macros/xserviceinfo.hxx | 8
framework/source/fwe/classes/addonsoptions.cxx | 11
framework/source/fwe/xml/menudocumenthandler.cxx | 14
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 1
framework/source/lomenubar/FrameHelper.cxx | 10
framework/source/uielement/addonstoolbarmanager.cxx | 10
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 13
framework/source/uielement/menubarmanager.cxx | 8
framework/source/uielement/popupmenucontroller.cxx | 4
framework/source/uielement/statusbarmanager.cxx | 9
framework/source/uielement/toolbarmanager.cxx | 7
graphite/README | 2
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2
hwpfilter/Library_hwp.mk | 4
i18npool/CppunitTest_i18npool_test_breakiterator.mk | 2
i18npool/CppunitTest_i18npool_test_characterclassification.mk | 2
i18npool/CppunitTest_i18npool_test_languagetag.mk | 2
i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 2
i18npool/Executable_gencoll_rule.mk | 2
i18npool/Executable_genconv_dict.mk | 2
i18npool/Executable_gendict.mk | 2
i18npool/Executable_genindex_data.mk | 2
i18npool/Executable_saxparser.mk | 2
i18npool/Library_collator_data.mk | 2
i18npool/Library_dict_ja.mk | 2
i18npool/Library_dict_zh.mk | 2
i18npool/Library_i18nisolang1.mk | 2
i18npool/Library_i18npool.mk | 2
i18npool/Library_i18nsearch.mk | 2
i18npool/Library_index_data.mk | 2
i18npool/Library_localedata_en.mk | 2
i18npool/Library_localedata_es.mk | 2
i18npool/Library_localedata_euro.mk | 2
i18npool/Library_localedata_others.mk | 2
i18npool/Library_textconv_dict.mk | 2
i18npool/source/localedata/data/hu_HU.xml | 2
i18nutil/Library_i18nutil.mk | 2
idl/Executable_svidl.mk | 2
io/Library_acceptor.mk | 2
io/Library_connector.mk | 2
io/Library_streams.mk | 2
io/Library_textinstream.mk | 2
io/Library_textoutstream.mk | 2
javaunohelper/Library_juh.mk | 2
javaunohelper/Library_juhx.mk | 2
jurt/Library_jpipe.mk | 2
jurt/Library_jpipx.mk | 2
jvmaccess/Library_jvmaccess.mk | 2
jvmfwk/Executable_javaldx.mk | 2
jvmfwk/Library_jvmfwk.mk | 6
jvmfwk/Library_sunjavaplugin.mk | 7
l10ntools/Executable_ulfconv.mk | 2
l10ntools/Makefile | 7
l10ntools/inc/cfgmerge.hxx | 37
l10ntools/inc/export.hxx | 37
l10ntools/inc/gsicheck.hxx | 37
l10ntools/inc/helpmerge.hxx | 37
l10ntools/inc/l10ntools/directory.hxx | 18
l10ntools/inc/l10ntools/file.hxx | 18
l10ntools/inc/lngmerge.hxx | 37
l10ntools/inc/tagtest.hxx | 37
l10ntools/inc/xmlparse.hxx | 37
l10ntools/inc/xrmmerge.hxx | 37
l10ntools/scripts/fast_merge.pl | 33
l10ntools/scripts/keyidGen.pl | 35
l10ntools/source/cfg_yy_wrapper.c | 18
l10ntools/source/cfglex.l | 19
l10ntools/source/cfgmerge.cxx | 37
l10ntools/source/directory.cxx | 37
l10ntools/source/export.cxx | 37
l10ntools/source/export2.cxx | 37
l10ntools/source/file.cxx | 43
l10ntools/source/filter/merge/FCFGMerge.cfg | 33
l10ntools/source/helpex.cxx | 37
l10ntools/source/helpmerge.cxx | 37
l10ntools/source/lngex.cxx | 37
l10ntools/source/lngmerge.cxx | 37
l10ntools/source/localize.cxx | 37
l10ntools/source/merge.cxx | 37
l10ntools/source/src_yy_wrapper.c | 18
l10ntools/source/srclex.l | 19
l10ntools/source/tagtest.cxx | 37
l10ntools/source/xmlparse.cxx | 37
l10ntools/source/xrm_yy_wrapper.c | 18
l10ntools/source/xrmlex.l | 19
l10ntools/source/xrmmerge.cxx | 37
lingucomponent/Library_MacOSXSpell.mk | 6
lingucomponent/Library_guesslang.mk | 2
lingucomponent/Library_hyphen.mk | 2
lingucomponent/Library_lnth.mk | 2
lingucomponent/Library_spell.mk | 2
lingucomponent/StaticLibrary_ulingu.mk | 10
linguistic/Library_lng.mk | 2
linguistic/source/lngsvcmgr.cxx | 24
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 2
lotuswordpro/Library_lwpft.mk | 2
lotuswordpro/source/filter/genericfilter.cxx | 2
lotuswordpro/util/lwpfilter.component | 2
neon/Library_neon.mk | 12
o3tl/CppunitTest_o3tl_tests.mk | 2
officecfg/CppunitTest_officecfg_cppheader_test.mk | 2
ooo.lst.in | 2
oox/Library_oox.mk | 2
oox/source/core/xmlfilterbase.cxx | 26
oox/source/export/chartexport.cxx | 28
package/Library_package2.mk | 2
package/Library_xstor.mk | 2
padmin/Executable_spadmin.bin.mk | 10
padmin/Library_spa.mk | 12
postprocess/packcomponents/makefile.mk | 2
pyuno/Library_pyuno_wrapper.mk | 4
regexp/Library_regexp.mk | 2
registry/Library_reg.mk | 2
remotebridges/Library_uuresolver.mk | 2
reportdesign/Library_rpt.mk | 2
reportdesign/Library_rptui.mk | 2
reportdesign/Library_rptxml.mk | 2
reportdesign/source/ui/report/propbrw.cxx | 10
rsc/Executable_rsc.mk | 2
sal/CppunitTest_Module_DLL.mk | 2
sal/CppunitTest_sal_bytesequence.mk | 2
sal/CppunitTest_sal_checkapi.mk | 2
sal/CppunitTest_sal_osl_condition.mk | 2
sal/CppunitTest_sal_osl_file.mk | 2
sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 2
sal/CppunitTest_sal_osl_module.mk | 2
sal/CppunitTest_sal_osl_mutex.mk | 2
sal/CppunitTest_sal_osl_old_test_file.mk | 2
sal/CppunitTest_sal_osl_pipe.mk | 2
sal/CppunitTest_sal_osl_process.mk | 6
sal/CppunitTest_sal_osl_profile.mk | 2
sal/CppunitTest_sal_osl_security.mk | 2
sal/CppunitTest_sal_osl_setthreadname.mk | 2
sal/CppunitTest_sal_osl_thread.mk | 2
sal/CppunitTest_sal_rtl_alloc.mk | 2
sal/CppunitTest_sal_rtl_cipher.mk | 2
sal/CppunitTest_sal_rtl_crc32.mk | 2
sal/CppunitTest_sal_rtl_doublelock.mk | 2
sal/CppunitTest_sal_rtl_locale.mk | 2
sal/CppunitTest_sal_rtl_math.mk | 2
sal/CppunitTest_sal_rtl_ostringbuffer.mk | 2
sal/CppunitTest_sal_rtl_oustringbuffer.mk | 2
sal/CppunitTest_sal_rtl_strings.mk | 2
sal/CppunitTest_sal_rtl_uri.mk | 2
sal/CppunitTest_sal_rtl_uuid.mk | 2
sal/CppunitTest_sal_tcwf.mk | 2
sal/CppunitTest_sal_types.mk | 2
sal/Executable_cppunittester.mk | 2
sal/Executable_osl_process_child.mk | 2
sal/Library_lo-bootstrap.mk | 2
sal/Library_sal.mk | 44
sal/Library_sal_textenc.mk | 2
sal/Library_uwinapi.mk | 3
salhelper/CppunitTest_salhelper_checkapi.mk | 2
salhelper/Library_salhelper.mk | 2
sax/CppunitTest_sax.mk | 2
sax/Library_expwrap.mk | 2
sax/Library_fastsax.mk | 2
sax/Library_sax.mk | 2
sax/StaticLibrary_sax_shared.mk | 4
saxon/ExternalProject_saxon.mk | 38
saxon/Makefile | 7
saxon/Module_saxon.mk | 22
saxon/Package_saxon.mk | 16
saxon/UnpackedTarball_saxon.mk | 16
saxon/build.xml | 1026 +++++++++
saxon/makefile.mk | 69
saxon/prj/build.lst | 2
saxon/prj/d.lst | 1
saxon/saxon-9.0.0.7-bj.patch | 1031 ----------
sc/CppunitTest_sc_annotationshapeobj.mk | 2
sc/CppunitTest_sc_cellrangeobj.mk | 2
sc/CppunitTest_sc_chart_regression_test.mk | 2
sc/CppunitTest_sc_databaserangeobj.mk | 2
sc/CppunitTest_sc_datapilotfieldobj.mk | 2
sc/CppunitTest_sc_datapilottableobj.mk | 2
sc/CppunitTest_sc_editfieldobj_cell.mk | 2
sc/CppunitTest_sc_editfieldobj_header.mk | 2
sc/CppunitTest_sc_filters_test.mk | 2
sc/CppunitTest_sc_macros_test.mk | 2
sc/CppunitTest_sc_modelobj.mk | 2
sc/CppunitTest_sc_namedrangeobj.mk | 2
sc/CppunitTest_sc_namedrangesobj.mk | 2
sc/CppunitTest_sc_rangelst_test.mk | 2
sc/CppunitTest_sc_subsequent_filters_test.mk | 2
sc/CppunitTest_sc_tableautoformatfield.mk | 2
sc/CppunitTest_sc_tablesheetobj.mk | 2
sc/CppunitTest_sc_tablesheetsobj.mk | 2
sc/CppunitTest_sc_ucalc.mk | 2
sc/Library_sc.mk | 2
sc/Library_scd.mk | 2
sc/Library_scfilt.mk | 2
sc/Library_scui.mk | 8
sc/Library_vbaobj.mk | 8
sc/inc/rangelst.hxx | 1
sc/inc/sc.hrc | 9
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/sdi/scalc.sdi | 120 +
sc/source/core/data/dpobject.cxx | 8
sc/source/core/tool/addincol.cxx | 18
sc/source/core/tool/rangelst.cxx | 15
sc/source/filter/excel/xecontent.cxx | 10
sc/source/filter/excel/xestyle.cxx | 13
sc/source/filter/oox/defnamesbuffer.cxx | 4
sc/source/filter/oox/sheetdatacontext.cxx | 13
sc/source/filter/xml/xmlstyli.cxx | 25
sc/source/filter/xml/xmlstyli.hxx | 1
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/condformat/condformatdlg.cxx | 39
sc/source/ui/condformat/condformatmgr.cxx | 6
sc/source/ui/docshell/docsh.cxx | 50
sc/source/ui/inc/condformatmgr.hxx | 1
sc/source/ui/miscdlgs/solverutil.cxx | 33
sc/source/ui/vba/excelvbahelper.cxx | 6
sc/source/ui/vba/vbahelper.cxx | 15
sc/source/ui/vba/vbaworksheet.cxx | 6
sc/source/ui/view/cellsh1.cxx | 4
scaddins/Library_analysis.mk | 2
scaddins/Library_date.mk | 2
sccomp/Library_solver.mk | 2
scp2/InstallModule_ooo.mk | 3
scp2/source/ooo/file_library_ooo.scp | 2
scripting/Library_basprov.mk | 2
scripting/Library_dlgprov.mk | 2
scripting/Library_protocolhandler.mk | 3
scripting/Library_scriptframe.mk | 2
scripting/Library_stringresource.mk | 2
scripting/Library_vbaevents.mk | 2
scripting/source/protocolhandler/scripthandler.cxx | 9
scripting/source/vbaevents/eventhelper.cxx | 12
sd/CppunitTest_sd_filters_test.mk | 2
sd/CppunitTest_sd_regression_test.mk | 2
sd/CppunitTest_sd_uimpress.mk | 4
sd/Library_sd.mk | 4
sd/Library_sdd.mk | 2
sd/Library_sdfilt.mk | 2
sd/Library_sdui.mk | 2
sd/source/core/CustomAnimationPreset.cxx | 20
sd/source/core/TransitionPreset.cxx | 22
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/app/tmplctrl.cxx | 12
sd/source/ui/unoidl/unopage.cxx | 18
sd/source/ui/view/viewshe2.cxx | 2
sdext/CppunitTest_pdfimport.mk | 2
sdext/CustomTarget_presenter.mk | 41
sdext/Extension_presenter.mk | 4
sdext/Module_sdext.mk | 1
sdext/StaticLibrary_pdfimport_s.mk | 9
sdext/source/minimizer/description.xml | 2
sdext/source/pdfimport/description.xml | 2
sdext/source/pdfimport/inc/pdfihelper.hxx | 4
sdext/source/pdfimport/inc/pdfparse.hxx | 3
sdext/source/pdfimport/misc/pwdinteract.cxx | 115 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 15
sdext/source/pdfimport/wrapper/wrapper.cxx | 97
sdext/source/presenter/PresenterWindowManager.hxx | 1
sdext/source/presenter/description.xml | 2
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp | 2
sfx2/CppunitTest_sfx2_metadatable.mk | 2
sfx2/Library_qstart.mk | 2
sfx2/Library_sfx.mk | 20
sfx2/source/dialog/dockwin.cxx | 15
sfx2/source/doc/doctemplates.cxx | 51
shell/Executable_gnome_open_url.mk | 4
shell/Executable_lngconvex.mk | 2
shell/Executable_senddoc.mk | 5
shell/Library_cmdmail.mk | 2
shell/Library_desktopbe.mk | 2
shell/Library_gconfbe.mk | 1
shell/Library_kde4be.mk | 1
shell/Library_kdebe.mk | 1
shell/Library_localebe.mk | 8
shell/Library_macbe.mk | 7
shell/Library_ooofilt.mk | 6
shell/Library_ooofilt_x64.mk | 4
shell/Library_propertyhdl.mk | 2
shell/Library_propertyhdl_x64.mk | 4
shell/Library_recentfile.mk | 2
shell/Library_shlxthdl.mk | 2
shell/Library_shlxthdl_x64.mk | 4
shell/Library_smplmail.mk | 5
shell/Library_syssh.mk | 2
shell/Library_syssh_win.mk | 7
shell/Library_tdebe.mk | 1
shell/Library_wininetbe.mk | 2
slideshow/CppunitTest_slideshow.mk | 2
slideshow/Executable_demoshow.mk | 2
slideshow/Library_OGLTrans.mk | 14
slideshow/Library_slideshow.mk | 2
solenv/bin/linkoo | 4
solenv/bin/modules/installer.pm | 72
solenv/bin/modules/installer/profiles.pm | 45
solenv/bin/modules/installer/ziplist.pm | 73
solenv/bin/modules/t/installer-profiles.t | 60
solenv/gbuild/AllLangResTarget.mk | 2
solenv/gbuild/Configuration.mk | 8
solenv/gbuild/CppunitTest.mk | 4
solenv/gbuild/Executable.mk | 4
solenv/gbuild/Helper.mk | 14
solenv/gbuild/InstallModuleTarget.mk | 4
solenv/gbuild/InternalUnoApi.mk | 9
solenv/gbuild/Library.mk | 5
solenv/gbuild/LinkTarget.mk | 7
solenv/gbuild/Module.mk | 6
solenv/gbuild/StaticLibrary.mk | 1
solenv/gbuild/TargetLocations.mk | 5
solenv/gbuild/UnpackedTarball.mk | 31
solenv/gbuild/gbuild.mk | 183 -
solenv/gbuild/platform/IOS_ARM_GCC.mk | 23
solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 25
solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 25
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 52
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 55
solenv/gbuild/platform/android.mk | 6
solenv/gbuild/platform/com_GCC_defs.mk | 4
solenv/gbuild/platform/macosx.mk | 33
solenv/gbuild/platform/solaris.mk | 25
solenv/gbuild/platform/unxgcc.mk | 17
solenv/gbuild/platform/windows.mk | 1
solenv/inc/wntmsc.mk | 12
soltools/Executable_adjustvisibility.mk | 16
soltools/Executable_checkdll.mk | 22
soltools/Executable_cpp.mk | 36
soltools/Executable_javadep.mk | 16
soltools/Executable_ldump4.mk | 17
soltools/Executable_makedepend.mk | 39
soltools/Makefile | 7
soltools/Module_soltools.mk | 40
soltools/Package_inc.mk | 11
soltools/adjustvisibility/makefile.mk | 50
soltools/checkdll/makefile.mk | 50
soltools/cpp/makefile.mk | 72
soltools/giparser/gen_info.cxx | 79
soltools/giparser/gi_list.cxx | 223 --
soltools/giparser/gi_parse.cxx | 387 ---
soltools/giparser/makefile.mk | 54
soltools/inc/gen_info.hxx | 82
soltools/inc/gi_list.hxx | 208 --
soltools/inc/gi_parse.hxx | 158 -
soltools/inc/gilacces.hxx | 97
soltools/inc/simstr.hxx | 216 --
soltools/inc/st_list.hxx | 323 ---
soltools/javadep/makefile.mk | 48
soltools/ldump/makefile.mk | 50
soltools/mkdepend/makefile.mk | 78
soltools/prj/build.lst | 14
soltools/prj/d.lst | 11
soltools/support/makefile.mk | 51
soltools/support/simstr.cxx | 822 -------
soltools/testhxx/create.pl | 116 -
soltools/testhxx/makefile.mk | 49
soltools/testhxx/testhxx.cxx | 22
soltools/util/makefile.pmk | 35
soltools/winunistd/makefile.mk | 43
sot/CppunitTest_sot_test_sot.mk | 2
sot/Library_sot.mk | 2
starmath/CppunitTest_starmath_qa_cppunit.mk | 2
starmath/Library_sm.mk | 2
starmath/Library_smd.mk | 2
stoc/Library_bootstrap.mk | 2
stoc/Library_introspection.mk | 2
stoc/Library_invocadapt.mk | 2
stoc/Library_invocation.mk | 2
stoc/Library_javaloader.mk | 2
stoc/Library_javavm.mk | 2
stoc/Library_namingservice.mk | 2
stoc/Library_proxyfac.mk | 2
stoc/Library_reflection.mk | 2
stoc/Library_stocservices.mk | 2
store/Library_store.mk | 2
svl/CppunitTest_svl_lngmisc.mk | 4
svl/CppunitTest_svl_urihelper.mk | 2
svl/Library_fsstorage.mk | 2
svl/Library_passwordcontainer.mk | 2
svl/Library_svl.mk | 2
svl/source/misc/urihelper.cxx | 13
svtools/CppunitTest_svtools_filters_test.mk | 2
svtools/Executable_bmp.mk | 2
svtools/Executable_bmpsum.mk | 2
svtools/Executable_g2g.mk | 2
svtools/Executable_langsupport.mk | 2
svtools/Library_hatchwindowfactory.mk | 3
svtools/Library_svt.mk | 4
svtools/source/hatchwindow/documentcloser.cxx | 17
svtools/source/misc/templatefoldercache.cxx | 36
svx/Executable_gengal.bin.mk | 19
svx/Library_svx.mk | 4
svx/Library_svxcore.mk | 2
svx/Library_textconversiondlgs.mk | 2
svx/inc/svx/svxids.hrc | 16
svx/sdi/svx.sdi | 125 -
svx/source/form/fmPropBrw.cxx | 4
svx/source/unodraw/unomod.cxx | 2
sw/CppunitTest_sw_filters_test.mk | 2
sw/CppunitTest_sw_layout_test.mk | 2
sw/CppunitTest_sw_macros_test.mk | 2
sw/CppunitTest_sw_regression_test.mk | 2
sw/CppunitTest_sw_subsequent_odfexport.mk | 2
sw/CppunitTest_sw_subsequent_odfimport.mk | 2
sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 2
sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 2
sw/CppunitTest_sw_subsequent_rtfexport.mk | 2
sw/CppunitTest_sw_subsequent_rtfimport.mk | 2
sw/CppunitTest_sw_subsequent_ww8export.mk | 2
sw/CppunitTest_sw_subsequent_ww8import.mk | 2
sw/CppunitTest_sw_swdoc_test.mk | 2
sw/Library_msword.mk | 2
sw/Library_sw.mk | 2
sw/Library_swd.mk | 2
sw/Library_swui.mk | 2
sw/Library_vbaswobj.mk | 2
sw/qa/extras/rtfimport/data/fdo52475.rtf | 5
sw/qa/extras/rtfimport/rtfimport.cxx | 225 --
sw/source/filter/ww8/ww8toolbar.cxx | 4
sw/source/ui/config/mailconfigpage.cxx | 5
sw/source/ui/dbui/dbmgr.cxx | 6
sw/source/ui/dbui/mailmergehelper.cxx | 16
sw/source/ui/inc/mailmergehelper.hxx | 20
sw/source/ui/utlui/tmplctrl.cxx | 12
tail_build/prj/build.lst | 2
test/Library_subsequenttest.mk | 2
test/Library_test.mk | 2
testtools/StaticLibrary_bridgetest.mk | 5
tomcat/ExternalProject_tomcat.mk | 36
tomcat/Makefile | 7
tomcat/Module_tomcat.mk | 22
tomcat/Package_tomcat.mk | 16
tomcat/UnpackedTarball_tomcat.mk | 17
tomcat/build.xml | 31
tomcat/prj/build.lst | 2
tomcat/prj/d.lst | 2
tomcat/tomcat.patch | 35
toolkit/Library_tk.mk | 6
tools/CppunitTest_tools_test.mk | 2
tools/Executable_bestreversemap.mk | 2
tools/Executable_mkunroll.mk | 2
tools/Executable_rscdep.mk | 2
tools/Executable_so_checksum.mk | 2
tools/Library_tl.mk | 12
touch/Library_libotouch.mk | 1
tubes/CppunitTest_tubes_test.mk | 2
tubes/Library_tubes.mk | 2
ucb/Library_cached1.mk | 2
ucb/Library_srtrs1.mk | 2
ucb/Library_ucb1.mk | 2
ucb/Library_ucpcmis1.mk | 2
ucb/Library_ucpdav1.mk | 12
ucb/Library_ucpexpand1.mk | 2
ucb/Library_ucpext.mk | 2
ucb/Library_ucpfile1.mk | 2
ucb/Library_ucpftp1.mk | 2
ucb/Library_ucpgio1.mk | 1
ucb/Library_ucpgvfs1.mk | 1
ucb/Library_ucphier1.mk | 3
ucb/Library_ucpodma1.mk | 2
ucb/Library_ucppkg1.mk | 2
ucb/Library_ucptdoc1.mk | 2
ucb/source/core/ucbcmds.cxx | 9
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 28
ucb/source/ucp/webdav/webdavcontent.cxx | 9
ucbhelper/Library_ucbhelper.mk | 2
ucpp/Makefile | 7
udm/StaticLibrary_udm.mk | 1
unotest/Library_unobootstrapprotector.mk | 2
unotest/Library_unoexceptionprotector.mk | 2
unotest/Library_unotest.mk | 2
unotools/Library_utl.mk | 2
unotools/source/config/lingucfg.cxx | 13
unoxml/Library_unordf.mk | 2
unoxml/Library_unoxml.mk | 2
uui/Library_uui.mk | 2
vbahelper/Library_msforms.mk | 2
vbahelper/Library_vbahelper.mk | 2
vbahelper/source/vbahelper/vbahelper.cxx | 12
vcl/Executable_kdefilepicker.mk | 1
vcl/Executable_tdefilepicker.mk | 1
vcl/Executable_ui-previewer.mk | 1
vcl/Library_desktop_detector.mk | 21
vcl/Library_vcl.mk | 73
vcl/Library_vclplug_gen.mk | 64
vcl/Library_vclplug_gtk.mk | 21
vcl/Library_vclplug_gtk3.mk | 22
vcl/Library_vclplug_kde.mk | 21
vcl/Library_vclplug_kde4.mk | 21
vcl/Library_vclplug_svp.mk | 10
vcl/Library_vclplug_tde.mk | 20
vcl/StaticLibrary_headless.mk | 13
vcl/StaticLibrary_vclmain.mk | 3
vcl/aqua/source/app/salinst.cxx | 22
vcl/source/window/menu.cxx | 4
writerfilter/CppunitTest_writerfilter_doctok.mk | 2
writerfilter/CppunitTest_writerfilter_rtftok.mk | 2
writerfilter/Library_writerfilter.mk | 2
writerfilter/Library_writerfilter_uno.mk | 2
writerfilter/source/dmapper/DomainMapper.cxx | 3
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3
writerperfect/Library_wpftdraw.mk | 2
writerperfect/Library_wpftwriter.mk | 2
writerperfect/StaticLibrary_writerperfect.mk | 10
xml2cmp/Executable_xml2cmp.mk | 6
xmlhelp/source/cxxhelp/provider/databases.cxx | 25
xmlhelp/source/cxxhelp/provider/provider.cxx | 13
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 18
xmloff/Library_xo.mk | 2
xmloff/Library_xof.mk | 2
xmloff/source/chart/SchXMLExport.cxx | 31
xmloff/source/chart/SchXMLImport.cxx | 18
xmloff/source/chart/SchXMLTools.cxx | 27
xmloff/source/draw/ximppage.cxx | 16
xmlreader/Library_xmlreader.mk | 2
xmlscript/Library_xmlscript.mk | 2
xmlsecurity/CppunitTest_qa_certext.mk | 2
xmlsecurity/Library_xmlsecurity.mk | 2
xmlsecurity/Library_xsec_fw.mk | 2
xmlsecurity/Library_xsec_xmlsec.mk | 8
907 files changed, 6060 insertions(+), 10686 deletions(-)
New commits:
commit 3c31c3c4b3ca08b171e593d2dd5cfa575a9721cc
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 13:29:38 2012 +0300
Prefixify textfd
Change-Id: I42c9166dcf6d256d071a3edb20ab64184fef1f89
diff --git a/filter/source/textfilterdetect/fdcomp.cxx b/filter/source/textfilterdetect/fdcomp.cxx
index 6be78b3..85b9f3b 100644
--- a/filter/source/textfilterdetect/fdcomp.cxx
+++ b/filter/source/textfilterdetect/fdcomp.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::registry;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textfd_component_getFactory(
const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
void* pRet = NULL;
diff --git a/filter/source/textfilterdetect/textfd.component b/filter/source/textfilterdetect/textfd.component
index e1708e7..d2d333a 100644
--- a/filter/source/textfilterdetect/textfd.component
+++ b/filter/source/textfilterdetect/textfd.component
@@ -28,7 +28,7 @@
* instead of those above.
**************************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="textfd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.filters.PlainTextFilterDetect">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
commit facb07ac2bb9eee692734f4d34e551ca48ceafba
Author: László Németh <nemeth at numbertext.org>
Date: Sat Sep 29 00:05:34 2012 +0200
Add back compatible Hungarian date format acceptance
Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd
Reviewed-on: https://gerrit.libreoffice.org/720
Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
Tested-by: Thorsten Behrens <tbehrens at suse.com>
diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml
index 2345e31..2b5d5ba 100644
--- a/i18npool/source/localedata/data/hu_HU.xml
+++ b/i18npool/source/localedata/data/hu_HU.xml
@@ -52,6 +52,8 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
+ <DateAcceptancePattern>M.D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
commit c2346026dda82abb94f88dc106066e49c4047047
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:30:38 2012 +0300
Deduplication of aEmptyStr for disable-dynlinking
Change-Id: I9525be3b0f238abb106b1c57549436272e1eb165
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index c1ce1e5..4c4a06a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -85,7 +85,9 @@
using namespace com::sun::star;
+#ifndef DISABLE_DYNLOADING // otherwise use the one in sw...
const String aEmptyStr;
+#endif
namespace sd {
commit f414326d862c249388f86e636008a60fc4cb31b0
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:30:15 2012 +0300
Deduplication of ImplGetSupportedMacroItems for disable-dynlinking
Change-Id: If6fb0a2152041f65d2e4b38dfbf87491b323f28f
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 47c96c8..b07ee32 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -106,7 +106,7 @@ public:
};
//-////////////////////////////////////////////////////////////////////
-const SvEventDescription* ImplGetSupportedMacroItems()
+static const SvEventDescription* ImplGetSupportedMacroItems()
{
static const SvEventDescription aMacroDescriptionsImpl[] =
{
commit 26af0cf3faefbab52fa86955bbe871c96e3b22ca
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:29:42 2012 +0300
Deduplication of NavigationOrderAccess for disable-dynlinking
Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index fcdae15..614cb88 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2602,10 +2602,10 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue )
throw IllegalArgumentException();
}
-class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
{
public:
- NavigationOrderAccess( SdrPage* pPage );
+ SdNavigationOrderAccess( SdrPage* pPage );
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException);
@@ -2619,7 +2619,7 @@ private:
std::vector< Reference< XShape > > maShapes;
};
-NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage )
+SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage )
: maShapes( static_cast< sal_uInt32 >( pPage ? pPage->GetObjCount() : 0 ) )
{
if( pPage )
@@ -2630,19 +2630,19 @@ NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage )
{
SdrObject* pObj = pPage->GetObj( nIndex );
sal_uInt32 nNavPos = pObj->GetNavigationPosition();
- DBG_ASSERT( !maShapes[nNavPos].is(), "sd::NavigationOrderAccess::NavigationOrderAccess(), duplicate navigation positions from core!" );
+ DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" );
maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY );
}
}
}
// XIndexAccess
-sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException)
+sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException)
{
return static_cast< sal_Int32 >( maShapes.size() );
}
-Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
if( (Index < 0) || (Index > getCount()) )
throw IndexOutOfBoundsException();
@@ -2651,12 +2651,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu
}
// XElementAccess
-Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException)
+Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException)
{
return XShape::static_type();
}
-sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException)
+sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException)
{
return maShapes.empty() ? sal_False : sal_True;
}
@@ -2665,7 +2665,7 @@ Any SdGenericDrawPage::getNavigationOrder()
{
if( GetPage()->HasObjectNavigationOrder() )
{
- return Any( Reference< XIndexAccess >( new NavigationOrderAccess( GetPage() ) ) );
+ return Any( Reference< XIndexAccess >( new SdNavigationOrderAccess( GetPage() ) ) );
}
else
{
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 9346e6a..7e57d11 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -563,10 +563,10 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName )
}
}
-class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
{
public:
- NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
+ XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException);
@@ -580,18 +580,18 @@ private:
std::vector< Reference< XShape > > maShapes;
};
-NavigationOrderAccess::NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes )
+XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes )
{
maShapes.swap( rShapes );
}
// XIndexAccess
-sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException)
+sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException)
{
return static_cast< sal_Int32 >( maShapes.size() );
}
-Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
if( (Index < 0) || (Index > getCount()) )
throw IndexOutOfBoundsException();
@@ -600,12 +600,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu
}
// XElementAccess
-Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException)
+Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException)
{
return XShape::static_type();
}
-sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException)
+sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException)
{
return maShapes.empty() ? sal_False : sal_True;
}
@@ -640,7 +640,7 @@ void SdXMLGenericPageContext::SetNavigationOrder()
}
Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW );
- xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new NavigationOrderAccess( aShapes ) ) ) );
+ xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) );
}
catch(const uno::Exception&)
{
commit 618dd74950d9c899a044089fa1f9117b97095f85
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:26:25 2012 +0300
Deduplication of lcl_HasOnlyControls for disable-dynlinking
Change-Id: I56a9da0493fdbee7bff4d342d5e29a83ce289530
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index a5137b9..a78afe7 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -281,7 +281,7 @@ ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* )
return pObj;
}
-sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
+static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
sal_Bool bOnlyControls = false; // default if there are no objects
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 353709c..8653fc6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -356,7 +356,7 @@ void SdTransferable::CreateData()
// -----------------------------------------------------------------------------
-sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
+static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
sal_Bool bOnlyControls = sal_False; // default if there are no objects
commit a22c7d8fa3663794e07910b832e8e4ed4809b488
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:24:37 2012 +0300
Prefixify t602filter
Change-Id: I652ffdf009f6078c723a0f0932256adb183e7513
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index a804632..1963ddb 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -44,6 +44,10 @@ using namespace T602ImportFilter;
extern "C"
{
+#ifdef DISABLE_DYNLOADING
+#define component_getFactory t602filter_component_getFactory
+#endif
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component
index fe512bf..cb36327 100644
--- a/filter/source/t602/t602filter.component
+++ b/filter/source/t602/t602filter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="t602filter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.T602ImportFilter">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
commit 4a1e37a66c2093cd1de96f68ae244f856822a7bd
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:24:22 2012 +0300
Prefixify svgfilter
Change-Id: Ifd34a186cd25bafbfd49dad8a1d5bd30756d83d3
diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component
index c4d5bff..f99b514 100644
--- a/filter/source/svg/svgfilter.component
+++ b/filter/source/svg/svgfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svgfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.SVGFilter">
<service name="com.sun.star.document.ImportFilter"/>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 0187a90..ea25cdd 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -302,7 +302,7 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.document.ExtendedTypeDetection" );
// The C shared lib entry points
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory(
sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
commit 645181f46472d459026d87c39b3475e834390761
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:22:51 2012 +0300
Prefixify lotuswordpro
Change-Id: I9b30477d94995adef51a76bdf298d1815f511e9e
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 1a37472..8708ae2 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -16,7 +16,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component
index 030c759..4989843 100644
--- a/lotuswordpro/util/lwpfilter.component
+++ b/lotuswordpro/util/lwpfilter.component
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="lotuswordpro"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
commit 1297ded2de9c8eaf0dd460fa4353a3e06765c400
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:06:53 2012 +0300
Deduplication of TemplatePopup_Impl for disable-dynlinking
Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 3978631..63abbc5 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -31,12 +31,12 @@
SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem );
-// class TemplatePopup_Impl --------------------------------------------------
+// class SdTemplatePopup_Impl --------------------------------------------------
-class TemplatePopup_Impl : public PopupMenu
+class SdTemplatePopup_Impl : public PopupMenu
{
public:
- TemplatePopup_Impl();
+ SdTemplatePopup_Impl();
sal_uInt16 GetCurId() const { return nCurId; }
@@ -48,7 +48,7 @@ private:
// -----------------------------------------------------------------------
-TemplatePopup_Impl::TemplatePopup_Impl() :
+SdTemplatePopup_Impl::SdTemplatePopup_Impl() :
PopupMenu(),
nCurId(USHRT_MAX)
{
@@ -56,7 +56,7 @@ TemplatePopup_Impl::TemplatePopup_Impl() :
// -----------------------------------------------------------------------
-void TemplatePopup_Impl::Select()
+void SdTemplatePopup_Impl::Select()
{
nCurId = GetCurItemId();
}
@@ -114,7 +114,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
return;
CaptureMouse();
- TemplatePopup_Impl aPop;
+ SdTemplatePopup_Impl aPop;
{
const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx
index b43d9c6..fba6dd7 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/ui/utlui/tmplctrl.cxx
@@ -36,12 +36,12 @@
SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem );
-// class TemplatePopup_Impl --------------------------------------------------
+// class SwTemplatePopup_Impl --------------------------------------------------
-class TemplatePopup_Impl : public PopupMenu
+class SwTemplatePopup_Impl : public PopupMenu
{
public:
- TemplatePopup_Impl();
+ SwTemplatePopup_Impl();
sal_uInt16 GetCurId() const { return nCurId; }
@@ -51,13 +51,13 @@ private:
virtual void Select();
};
-TemplatePopup_Impl::TemplatePopup_Impl() :
+SwTemplatePopup_Impl::SwTemplatePopup_Impl() :
PopupMenu(),
nCurId(USHRT_MAX)
{
}
-void TemplatePopup_Impl::Select()
+void SwTemplatePopup_Impl::Select()
{
nCurId = GetCurItemId();
}
@@ -98,7 +98,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
GetStatusBar().GetItemText( GetId() ).Len() )
{
CaptureMouse();
- TemplatePopup_Impl aPop;
+ SwTemplatePopup_Impl aPop;
{
SwView* pView = ::GetActiveView();
SwWrtShell* pWrtShell;
commit 1a597d6a5919e7d26958f380da7294eb0eebca6a
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date: Sat Sep 29 11:29:56 2012 +0700
configure.in: edit message checking for new GStreamer 1.0
to not duplicate the message checking for old one
and be consistent with the help message in AS_HELP_STRING
Change-Id: I91e0a5ed0e2278de013d7872eadc6f93b970c231
Reviewed-on: https://gerrit.libreoffice.org/722
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/configure.in b/configure.in
index 7c7ce66..906c530 100644
--- a/configure.in
+++ b/configure.in
@@ -9519,7 +9519,7 @@ ENABLE_GSTREAMER=""
if test "$build_gstreamer" = "yes"; then
- AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
+ AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend])
if test "x$enable_gstreamer" != "xno"; then
ENABLE_GSTREAMER="TRUE"
AC_MSG_RESULT([yes])
commit dc27f1891ec29328a250b4f8cb87ac90473a8825
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Sep 29 08:33:27 2012 +0900
use "LibreOffice" as the default value of ProductKey for crashrep
Change-Id: I12bab12ad32f4965b55d94dfd2d6fe8894129763
Reviewed-on: https://gerrit.libreoffice.org/721
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index daedb62..0721950 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -2226,7 +2226,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
GetPrivateProfileString(
TEXT("Bootstrap"),
TEXT("ProductKey"),
- TEXT("OpenOffice.org"),
+ TEXT("LibreOffice"),
szBuffer,
SAL_N_ELEMENTS(szBuffer),
szModuleName )
commit 074236253344cd51892c1feecdbe07c8365fcb95
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 1 11:46:24 2012 +0200
Fail early if getPackageLocation fails; plus clean-up
Change-Id: Ifa7d589e7854fed9cd9ca2a3f3c987179b60199f
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 2d76fff..77ce15b 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -44,7 +44,7 @@
#include "com/sun/star/io/XInputStream.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/awt/FontDescriptor.hpp"
-#include "com/sun/star/deployment/XPackageInformationProvider.hpp"
+#include "com/sun/star/deployment/PackageInformationProvider.hpp"
#include "com/sun/star/beans/XMaterialHolder.hpp"
#include "com/sun/star/rendering/PathCapType.hpp"
#include "com/sun/star/rendering/PathJoinType.hpp"
@@ -999,24 +999,21 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR
if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false )
return false;
- rtl::OUStringBuffer converterURL = rtl::OUString("xpdfimport");
-
- // retrieve package location url (xpdfimport executable is located there)
- // ---------------------------------------------------
- uno::Reference<deployment::XPackageInformationProvider> xProvider(
- xContext->getValueByName(
- rtl::OUString("/singletons/com.sun.star.deployment.PackageInformationProvider")),
- uno::UNO_QUERY);
- if( xProvider.is() )
- {
- converterURL.insert(
- 0,
- rtl::OUString("/"));
- converterURL.insert(
- 0,
- xProvider->getPackageLocation(
- rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER)));
+ // Retrieve package location URL, xpdfimport executable is located there:
+ OUString location(
+ deployment::PackageInformationProvider::get(xContext)->
+ getPackageLocation(PDFI_IMPL_IDENTIFIER));
+ if (location.isEmpty()) {
+ SAL_WARN(
+ "sdext.pdfimport",
+ "getPackageLocation(" PDFI_IMPL_IDENTIFIER ") failed");
+ return false;
+ }
+ rtl::OUStringBuffer converterURL(location);
+ if (!location.endsWith("/")) {
+ converterURL.append('/');
}
+ converterURL.append("xpdfimport");
// spawn separate process to keep LGPL/GPL code apart.
// ---------------------------------------------------
commit 1cccf3b255ac624e6cdaf2b7bf941edf34035816
Author: Andras Timar <atimar at suse.com>
Date: Mon Oct 1 11:43:05 2012 +0200
Revert "take out @PLATFORM@ from extension ID"
This reverts commit 21a82f4f91eb9940e5dd01c75e2f68721a431f09.
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
new file mode 100644
index 0000000..afecd49
--- /dev/null
+++ b/sdext/CustomTarget_presenter.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
+
+$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
+ $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp
+
+include $(SRCDIR)/sdext/platform.mk
+
+$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \
+ $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
+ | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
+ sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 771f8d6..66f93a8 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -141,9 +141,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi
$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
))
-$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
+$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
-$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen))
+$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM)))
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 0ab6444..7bba9d9 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -56,6 +56,7 @@ endif
ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
$(eval $(call gb_Module_add_targets,sdext,\
Configuration_presenter \
+ CustomTarget_presenter \
Extension_presenter \
Library_presenter \
Rdb_presenter \
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 2ef9268..f071a06 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -5,7 +5,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
- <identifier value="com.sun.star.PresentationMinimizer"/>
+ <identifier value="com.sun.star.PresentationMinimizer- at PLATFORM@"/>
<dependencies>
<OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml
index 893f62a..0816004 100644
--- a/sdext/source/pdfimport/description.xml
+++ b/sdext/source/pdfimport/description.xml
@@ -4,7 +4,7 @@
xmlns="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
- <identifier value="com.sun.star.PDFImport" />
+ <identifier value="com.sun.star.PDFImport- at PLATFORM@" />
<dependencies>
<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 8be0767..be71e44 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -5,7 +5,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <identifier value="com.sun.PresenterScreen" />
+ <identifier value="com.sun.PresenterScreen- at PLATFORM@" />
<dependencies>
<OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index c579971..1c07357 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -34,7 +34,7 @@
<meta>
<topic id="textpresenterxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit" l10n="NEW">Presenter Console Keyboard Shortcuts</title>
- <filename>/com.sun.PresenterScreen/presenter.xhp</filename>
+ <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
</topic>
</meta>
<body>
commit a428b694a63fbc785cc7c0748e6fd0ce2d23b4b8
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 28 17:45:21 2012 +0200
fdo#52475 fix import of RTF_CHCBPAT with value 0
0 means auto, and for fdo#50539, this value was ignored. However a next
sample shows that we should send something to the dmapper: COL_AUTO.
Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d
diff --git a/sw/qa/extras/rtfimport/data/fdo52475.rtf b/sw/qa/extras/rtfimport/data/fdo52475.rtf
new file mode 100644
index 0000000..fe4a557
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo52475.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+{\colortbl;\red228\green228\blue228;}
+before \chcbpat1 highlighted\chcbpat0 after
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 61813f1..997e33d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -108,6 +108,7 @@ public:
void testInk();
void testFdo52389();
void testFdo49655();
+ void testFdo52475();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -159,6 +160,7 @@ public:
CPPUNIT_TEST(testInk);
CPPUNIT_TEST(testFdo52389);
CPPUNIT_TEST(testFdo49655);
+ CPPUNIT_TEST(testFdo52475);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -843,6 +845,13 @@ void Test::testFdo49655()
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
}
+void Test::testFdo52475()
+{
+ // The problem was that \chcbpat0 resulted in no color, instead of COL_AUTO.
+ load("fdo52475.rtf");
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty<sal_Int32>(getRun(getParagraph(1), 3), "CharBackColor"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5e33654..d56307f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2566,9 +2566,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
m_aDefaultState.aCharacterSprms.set(NS_sprm::LN_CLidBi, pIntValue);
break;
case RTF_CHCBPAT:
- if (nParam)
{
- RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
+ RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO));
lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
}
break;
commit 36158d016420a4a7a1eff405560d7637affa5372
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 1 09:42:40 2012 +0100
menus are way too wide, wrong checkbox/radiobutton width
Change-Id: Ib8f1a21f19812092e2561621909f74fd98af2857
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c8f2e97..2920878 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2254,7 +2254,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon
)
{
rCheckHeight = aNativeBounds.GetHeight();
- nCheckWidth = aNativeBounds.GetWidth();
+ nCheckWidth = aNativeContent.GetWidth();
}
}
if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM_RADIO_MARK ) )
@@ -2270,7 +2270,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon
)
{
rRadioHeight = aNativeBounds.GetHeight();
- nRadioWidth = aNativeBounds.GetWidth();
+ nRadioWidth = aNativeContent.GetWidth();
}
}
}
commit 61b2f6f9929d636f1d0534bebd7aca78c39c5c4f
Author: David Tardon <dtardon at redhat.com>
Date: Mon Oct 1 07:24:16 2012 +0200
add saxon to tail_build
Change-Id: I01e2b99a2618c3b4e5e80dc9e38652e75ef5217d
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index db82ee1..a0c958b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
salhelper \
sane \
sax \
+ $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5e84fda..4129e20 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
+tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 34af69ddf3ae8edb5e449350ffe6ca4546178ae9
Author: David Tardon <dtardon at redhat.com>
Date: Mon Oct 1 06:17:06 2012 +0200
fix InternalUnoApi IDL deps
Change-Id: I02bd49c6f6b252c6797292b8e4a9bc319fe0947e
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 3dd32ee..8949323 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,7 +52,10 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out)
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
-$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(1)_out)
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out)
$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1))
@@ -72,8 +75,8 @@ endef
define gb_InternalUnoApi__use_api
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
-$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
+$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef
commit 57ec0707acb3e2cc2c2de35295b964ed046cf493
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 30 18:51:11 2012 +0200
add missing deps on headers to static libs
Change-Id: I7a28dfa13bf0f98a654eca98eb1cdfd99177f37a
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index bbea555..04b53db 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
codemaker_inc \
+ registry_inc \
sal_generated \
))
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index b8cabf4..92678fa 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
codemaker_inc \
+ registry_inc \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 6538e38..f33d38e 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
codemaker_inc \
+ registry_inc \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 3bc66a2..9767efa 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -27,6 +27,16 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
+$(eval $(call gb_StaticLibrary_use_packages,ulingu,\
+ comphelper_inc \
+ cppu_inc \
+ cppuhelper_inc \
+ i18npool_inc \
+ linguistic_inc \
+ tools_inc \
+ unotools_inc \
+))
+
$(eval $(call gb_StaticLibrary_use_api,ulingu,\
udkapi \
offapi \
diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk
index cdbc3c8..bf6887c 100644
--- a/sax/StaticLibrary_sax_shared.mk
+++ b/sax/StaticLibrary_sax_shared.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared))
+$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\
+ cppu_inc \
+))
+
$(eval $(call gb_StaticLibrary_set_include,sax_shared,\
-I$(SRCDIR)/sax/inc \
$$(INCLUDE) \
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 20065a9..bf49da3 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -30,6 +30,11 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
$(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
+ basegfx_inc \
+ comphelper_inc \
+ cppu_inc \
+ cppuhelper_inc \
+ o3tl_inc \
tools_inc \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index ed96f34..23254e7 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -27,6 +27,11 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
+$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\
+ cppu_inc \
+ cppuhelper_inc \
+))
+
$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
bridgetest \
))
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index a07497c..a3dc220 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -28,6 +28,19 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,headless))
+$(eval $(call gb_StaticLibrary_use_packages,headless,\
+ basebmp_inc \
+ basegfx_inc \
+ comphelper_inc \
+ cppu_inc \
+ cppuhelper_inc \
+ i18npool_inc \
+ i18nutil_inc \
+ o3tl_inc \
+ tools_inc \
+ unotools_inc \
+))
+
$(eval $(call gb_StaticLibrary_use_api,headless,\
offapi \
udkapi \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 05a6f3e..98998bb 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -29,6 +29,9 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
$(eval $(call gb_StaticLibrary_use_packages,vclmain,\
+ comphelper_inc \
+ cppu_inc \
+ cppuhelper_inc \
tools_inc \
))
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index 6aec3ae..995b1ba 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -19,6 +19,16 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
+$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
+ comphelper_inc \
+ cppu_inc \
+ cppuhelper_inc \
+ sot_inc \
+ tools_inc \
+ unotools_inc \
+ xmloff_inc \
+))
+
$(eval $(call gb_StaticLibrary_set_include,writerperfect,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
commit 9b618d894af9ba4b60c631ed9e48910149434f4a
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 30 14:17:16 2012 +0200
do not rely on target-spec. var. inheritance
The whole idea of having two paths to look for schemas (one local, for
module, and one global, in $(OUTDIR)) is bad anyway, because there is no
way to do it in XSLT without warning if the checked schema does not
exist in the first path. I see two ways out of that:
1. rewrite schema_val.xsl in a decent language
2. split the node reference check in schema_val.xsl into two phases: the
first phase returns a list of subpaths to check, a helper script
processes that, finds the real paths and feeds it to the second phase
XSL, which does the internal check.
Change-Id: Icfe3f9ec0960cfd3423c1223ad8f495d7634b25a
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index b9d2e7f..a5d202b 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -54,6 +54,8 @@
#
gb_Configuration__get_source = $(SRCDIR)/$(2)
+# The main LibreOffice registry
+gb_Configuration_PRIMARY_REGISTRY_NAME := registry
# XcsTarget class
@@ -77,7 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\
--noout \
--stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \
--stringparam root $(subst $(XCSFILE),,$(3)) \
- $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \
+ $(if $(PRIMARY_REGISTRY),,--stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,)) \
$(gb_XcsTarget_XSLT_SchemaVal) \
$(3) && \
$(gb_XSLTPROC) --nonet \
@@ -359,8 +361,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_Zip_get_clean_target,$(1)_$(lang))))
-$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT :=
-
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
endef
@@ -374,6 +374,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
$(call gb_Configuration_get_preparation_target,$(1))
+$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_Configuration_get_target,$(1)) : \
@@ -514,7 +515,6 @@ endef
# $(eval $(call gb_Configuration_use_configuration,foo,registry))
define gb_Configuration_use_configuration
$(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2))
-$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema
endef
commit 398f915a5bfa70263aef49a876736c61f9e7f0fd
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 30 08:13:57 2012 +0200
drop unused include
Change-Id: I21360e2d65b64bc27f02d677eda05f9d9d765367
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index d2a5ae2..88a748e 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -47,7 +47,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase4.hxx>
-#include <tools/gen.hxx>
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
commit 504a5eb0c02f8b53c40d7fb9e680c4df67aebfe7
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 30 07:35:08 2012 +0200
add missing dep for tools/errcode.hxx
Change-Id: I6e63a545332a1b865a26b355db49869c214f97c7
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 699e3e7..20065a9 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -29,6 +29,10 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
$(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
+$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
+ tools_inc \
+))
+
$(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
offapi \
udkapi \
commit dab0d5153605d26e3aa59c142d8845303169e3f5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 30 06:56:04 2012 +0200
add missing deps for tools/color.hxx
Change-Id: I164afe17c3bff2f7d7f2b9daec0d5a5ca8fdf97a
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 0f6af60..866257e 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -30,6 +30,12 @@
$(eval $(call gb_Executable_Executable,nsplugin))
+$(eval $(call gb_Executable_use_packages,nsplugin,\
+ basegfx_inc \
+ comphelper_inc \
+ tools_inc \
+))
+
$(eval $(call gb_Executable_use_sdk_api,nsplugin))
$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index c9b6ee9..4aeb45a 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/presentation/XPresentation.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <comphelper/processfactory.hxx>
-#include <vcl/window.hxx>
+#include <tools/color.hxx>
#include <rtl/textenc.h>
#include <rtl/locale.h>
#include <osl/nlsupport.h>
commit da059ff6377c3f4b779daedfe6365dcfc47b53de
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sun Sep 30 23:59:29 2012 +0200
gbuildification of saxon
Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586
diff --git a/Makefile.top b/Makefile.top
index 8fd5620..e188cdc 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -133,6 +133,7 @@ sal\
salhelper\
sane\
sax\
+saxon\
sc\
scaddins\
sccomp\
@@ -245,7 +246,6 @@ postprocess\
python\
redland\
rhino\
-saxon\
setup_native\
stax\
stlport\
diff --git a/config_host.mk.in b/config_host.mk.in
index 9814f16..473ab5d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -483,6 +483,7 @@ export RTL_ARCH=@RTL_ARCH@
export SAC_JAR=@SAC_JAR@
export SAL_ENABLE_FILE_LOCKING=1
export SAXON_JAR=@SAXON_JAR@
+export SAXON_TARBALL=@SAXON_TARBALL@
export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
diff --git a/configure.in b/configure.in
index ac9266c..7c7ce66 100644
--- a/configure.in
+++ b/configure.in
@@ -7697,9 +7697,11 @@ else
AC_MSG_RESULT([internal])
SYSTEM_SAXON=NO
NEED_SAXON=TRUE
+ SAXON_TARBALL=ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
fi
fi
AC_SUBST(SYSTEM_SAXON)
+AC_SUBST(SAXON_TARBALL)
AC_SUBST(SAXON_JAR)
if test -n "$NEED_SAXON"; then
diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
new file mode 100644
index 0000000..03f0b94
--- /dev/null
+++ b/saxon/ExternalProject_saxon.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,saxon))
+
+$(eval $(call gb_ExternalProject_use_unpacked,saxon,saxon))
+
+$(eval $(call gb_ExternalProject_register_targets,saxon,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,saxon,build) :
+ cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \
+ ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
+ "$(ANT)" \
+ -q \
+ -f build.xml \
+ -Dbuild.label="build-libreoffice" \
+ $(if $(filter YES,$(SYSTEM_TOMCAT))\
+ ,-Dservletapi.jar=$(SERVLETAPI_JAR) \
+ ,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
+ )\
+ $(if $(filter yes,$(JAVACISGCJ))\
+ ,-Dbuild.compiler=gcj \
+ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+ -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+ ) \
+ $(if $(debug),-Dbuild.debug="on") \
+ -Dsolarbindir=$(SOLARBINDIR) jar-bj && \
+ touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/saxon/Makefile b/saxon/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/saxon/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/saxon/Module_saxon.mk b/saxon/Module_saxon.mk
new file mode 100644
index 0000000..0ac17fe
--- /dev/null
+++ b/saxon/Module_saxon.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,saxon))
+
+ifneq ($(SOLAR_JAVA),)
+ifneq ($(filter SAXON,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_targets,saxon,\
+ ExternalProject_saxon \
+ Package_saxon \
+ UnpackedTarball_saxon \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/saxon/Package_saxon.mk b/saxon/Package_saxon.mk
new file mode 100644
index 0000000..ba19d97
--- /dev/null
+++ b/saxon/Package_saxon.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,saxon_inc,$(call gb_UnpackedTarball_get_dir,saxon)))
+
+$(eval $(call gb_Package_use_external_project,saxon_inc,saxon))
+
+$(eval $(call gb_Package_add_file,saxon_inc,bin/saxon9.jar,saxon-build/9.0.0.7/bj/saxon9.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/saxon/UnpackedTarball_saxon.mk b/saxon/UnpackedTarball_saxon.mk
new file mode 100644
index 0000000..206257b
--- /dev/null
+++ b/saxon/UnpackedTarball_saxon.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,saxon))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,saxon,$(SAXON_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_file,saxon,build.xml,saxon/build.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/saxon/build.xml b/saxon/build.xml
new file mode 100644
index 0000000..c9026f7
--- /dev/null
+++ b/saxon/build.xml
@@ -0,0 +1,1026 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project basedir="." default="all" name="Saxon-B The XSLT and XQuery Processor"
+ xmlns:dn="antlib:org.apache.ant.dotnet">
+
+ <!-- TODO *really* Must publish NOTICES directory with patch releases. Should also
+ publish doc directory, and add a notice concerning Saxon/MPL itself, as per section 3.6 of MPL 1.0 -->
+
+ <!--TODO: 1: ensure saxon9api.netmodule is included in the build
+ 2: remove the archive target before shipping this file-->
+
+ <!-- note : Ant 1.7 is needed for this script -->
+
+ <!-- Ant 1.7 introduces a <service> element to allow META-INF/services
+ directories to be created in JAR files. Unfortunately it is broken,
+ see http://issues.apache.org/bugzilla/show_bug.cgi?id=41201. The relevant
+ code here is retained in the form of comments, and can be reinstated
+ when the bug is fixed. Meanwhile the directories are created manually -->
+
+ <!-- Build file for Saxon. This builds all four for the released products:
+ Saxon-B and Saxon-SA, on both the Java and .NET platforms. It also builds
+ the released resources file. A full build requires access to Saxonica
+ proprietary source code. The open source Saxon-B product can be built for
+ Java using target "bj"; but building Saxon-B for .NET may require some
+ disentangling of tasks that depend on Saxon-SA being present. -->
+
+ <!-- Useful targets:
+
+ clean clears temporary directories
+ bj builds executables for Saxon-B
+ saj builds executables for Saxon-B and Saxon-SA
+ n builds executables for Saxon on .NET
+ build builds all executables
+ resources builds samples and documentation
+ release builds ZIP files for published downloads
+ archive produces a back-up archive -->
+
+
+ <!-- Naming conventions:
+ -n : .NET
+ -j : Java
+ -b : Saxon-B
+ -sa : Saxon-SA
+ combined as appropriate, so -bj denotes Saxon-B on the Java platform
+ -->
+
+ <property name="version" value="9.0.0.7"/>
+ <property name="versionh" value="9-0-0-7"/>
+ <property name="release.date" value="2008-07-03"/>
+
+ <!-- following locations are specific to the machine -->
+
+ <!-- root drive for input files-->
+ <property name="root" value="."/>
+
+ <!-- root drive for generated files-->
+ <property name="troot" value="."/>
+
+ <!-- directory holding Java source code -->
+ <property name="development-j.dir" value="${root}/MyJava/saxon8.x"/>
+
+ <!-- directory holding Java source code as in Subversion -->
+ <property name="subversion-j.dir" value="${root}"/>
+
+ <!-- directory holding latest patch state of Saxon-SA Java code -->
+ <property name="saj-patch.dir" value="${root}/saxon-90-patch"/>
+
+ <!-- directory holding Java test drivers -->
+ <property name="drivers-j.dir" value="${root}/MyJava/test"/>
+
+ <!-- directories holding C# source code -->
+ <property name="vss-n.dir" value="${root}/Documents and Settings/Mike/My Documents/Visual Studio 2005/Projects/Saxon.Api"/>
+
+ <!-- directory holding C# source code as in Subversion -->
+ <property name="subversion-n.dir" value="${root}/saxon-svn/latest9.0/bn/csource"/>
+
+ <!-- directory holding XML user documentation -->
+ <property name="userdoc.dir" value="${root}/MyJava/doc/saxon8"/>
+
+ <!-- directory holding .NET API documentation (which is built manually using NDOC -->
+ <property name="dotnetdoc.dir" value="${root}/MyDotNet/dotnetdoc"/>
+
+ <!-- directories holding use cases and sample applications -->
+ <property name="usercases.dir" value="${root}/MyJava/use-cases"/>
+ <property name="samples.dir" value="${root}/MyJava/samples"/>
+
+ <!-- directory in which to build the product for release -->
+ <property name="product.dir" value="${troot}/saxon-build/${version}"/>
+
+ <!-- directory in which to build the issued .ZIP files -->
+ <property name="issue.dir" value="${troot}/saxon-issues/saxon-issue-${release.date} (${version})"/>
+
+ <!-- location of the C# compiler -->
+ <property name="csharp.compiler" value="c:/Windows/Microsoft.NET/Framework/v1.1.4322/csc.exe"/>
+
+
+ <!-- following locations are for IKVMC code used to build the .NET product -->
+
+ <property name="development-ikvm.dir" value="${root}/MyDotNet"/>
+ <property name="ikvm.dir" value="${development-ikvm.dir}/ikvm-0.32.0.0"/>
+ <property name="generated.stubs.dir" value="${development-ikvm.dir}/stubs"/>
+ <property name="saxondotnet.snk" value="${development-ikvm.dir}/make/saxondotnet.snk"/>
+
+ <!-- Precondition for .NET compilation: IKVM is installed.
+ * Download from www.ikvm.net
+ * Unzip into ${development-ikvm.dir}
+ * Register in the GAC (access the Microsoft .NET Framework Configuration item in the
+ Windows Control Panel, and add the assemblies to the Assembly Cache.
+ At a minimum, install the IKVM.GNU.Classpath.dll and IKVM.Runtime.dll)
+ * Generate stubs in ${generated.stubs.dir}
+ for System.Xml.dll, System.Security.dll, and IKVM.GNU.Classpath.dll
+ -->
+
+ <!-- following locations are relative to the build file -->
+
+ <property name="lib.dir" value="libs"/>
+ <property name="temp.dir" value="temp"/>
+ <property name="archive.dir" value="archive"/>
+ <property name="services.dir" value="services"/>
+ <property name="temp-src-j.dir" value="${temp.dir}/j/source"/>
+ <property name="temp-src-nj.dir" value="${temp.dir}/n/jsource"/>
+ <property name="temp-src-nc.dir" value="${temp.dir}/n/csource"/>
+ <property name="classes-j.dir" value="${temp.dir}/j/classes"/>
+ <property name="classes-n.dir" value="${temp.dir}/n/classes"/>
+ <property name="jar-n.dir" value="${temp.dir}/n/jar"/>
+ <property name="dll-n.dir" value="${temp.dir}/n/dll"/>
+
+ <!-- following locations are relative to the destination directory -->
+
+ <property name="build-bj.dir" value="${product.dir}/bj"/>
+ <property name="build-saj.dir" value="${product.dir}/saj"/>
+ <property name="build-bn.dir" value="${product.dir}/bn"/>
+ <property name="build-san.dir" value="${product.dir}/san"/>
+ <property name="build-resources.dir" value="${product.dir}/resources"/>
+ <property name="javadoc.dir" value="${build-resources.dir}/doc/javadoc"/>
+
+
+ <property name="build.debug" value="true"/>
+ <property name="build.debuglevel" value="source,lines,vars"/>
+ <property name="build.deprecation" value="true"/>
+ <property name="build.optimize" value="true"/>
+ <property name="build.compiler.source" value="1.4"/>
+ <property name="build.compiler.target" value="1.4"/>
+ <property name="build.s9api.compiler.source" value="1.5"/>
+ <property name="build.s9api.compiler.target" value="1.5"/>
+ <property name="build.compress" value="false"/>
+
+ <!-- following properties can be switched to determine whether to build from patch source
+ or from development source -->
+
+ <!-- patch source -->
+
+ <property name="source-bj.dir" value="${subversion-j.dir}"/>
+ <property name="source-saj.dir" value="${saj-patch.dir}"/>
+ <property name="source-api-n.dir" value="${subversion-n.dir}/api/Saxon.Api"/>
+ <property name="source-cmd-n.dir" value="${subversion-n.dir}/cmd"/>
+ <property name="source-samples-n.dir" value="${subversion-n.dir}/samples"/>
+
+ <!-- development source -->
+ <!--
+ <property name="source-bj.dir" value="${development-j.dir}"/>
+ <property name="source-saj.dir" value="${development-j.dir}"/>
+ <property name="source-api-n.dir" value="${vss-n.dir}"/>
+ <property name="source-cmd-n.dir" value="${vss-n.dir}"/>
+ <property name="source-samples-n.dir" value="${vss-n.dir}"/>
+ -->
+
+ <property name="solar.bin" value="${solarbindir}"/>
+ <path id="classpath-j">
+ <fileset dir="${solar.bin}">
+ <include name="jsr173_1.0_api.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath-n">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${ikvm.dir}">
+ <include name="classpath/mscorlib.jar"/>
+ <include name="classpath/System.jar"/>
+ <include name="bin/IKVM.GNU.Classpath.jar"/>
+ <include name="bin/IKVM.Runtime.jar"/>
+ </fileset>
+ <fileset dir="${generated.stubs.dir}">
+ <include name="System.Xml.jar"/>
+ <include name="System.Security.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath-samples">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${build-saj.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <!-- Substitute build-bj.dir if there is no requirement to compile the sample applications
+ that depend on Saxon-SA -->
+ </path>
+
+ <target name="clean" description="Clean all files other than source code and downloaded jars.">
+ <delete dir="${temp.dir}"/>
+ <delete dir="${product.dir}"/>
+ <mkdir dir="${product.dir}"/>
+ </target>
+
+ <target name="download" description="Download third-party jar files.">
+ <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"
+ dest="${lib.dir}/dom4j-1.6.1.jar" verbose="true"/>
+
+ <get src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar"
+ dest="${lib.dir}/jdom-1.0.jar" verbose="true"/>
+
+ <get src="http://www.cafeconleche.org/XOM/xom-1.1.jar" dest="${lib.dir}/xom-1.1.jar"
+ verbose="true"/>
+
+ <get src="http://dist.codehaus.org/stax/jars/stax-api-1.0.1.jar" dest="${lib.dir}/stax-api-1.0.1.jar"
+ verbose="true"/>
+
+ <!-- TODO: add servlet.jar, ant.jar -->
+
+ </target>
+
+
+ <target name="copysource-development" description="Copy relevant source files from development directory">
+ <copy todir="${temp-src-j.dir}">
+ <fileset dir="${source-bj.dir}">
+ <include name="net/sf/saxon/**/*.java"/>
+ <exclude name="**/dotnet/**"/>
+ <!--<exclude name="**/s9api/**"/> s9api needs Java 5 -->
+ <include name="net/sf/saxon/**/package.html"/>
+ </fileset>
+ <!--
+ <fileset dir="${source-saj.dir}">
+ <include name="com/saxonica/**/*.java"/>
+ <exclude name="com/saxonica/validate/DotNetVerifier.java"/>
+ <include name="com/saxonica/**/package.html"/>
+ </fileset>
+ -->
+ </copy>
+ <!--
+ <replace file="${temp-src-j.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
+ token="/*DOTNETONLY*/"
+ value="//"
+ summary="yes"/>
+ -->
+ <replace file="${temp-src-j.dir}/net/sf/saxon/Configuration.java"
+ token="/*DOTNETONLY*/"
+ value="//"
+ summary="yes"/>
+ <copy todir="${temp-src-nj.dir}">
+ <fileset dir="${source-bj.dir}">
+ <include name="net/sf/saxon/**/*.java"/>
+ <exclude name="**/ant/**"/>
+ <exclude name="**/dom/**"/>
+ <exclude name="**/dom4j/**"/>
+ <exclude name="**/java/**"/>
+ <exclude name="**/javax/**"/>
+ <exclude name="**/jdom/**"/>
+ <exclude name="**/pull/PullToStax.java"/>
+ <exclude name="**/pull/StaxBridge.java"/>
+ <!-- <exclude name="**/s9api/**"/> s9api needs Java 5 -->
+ <exclude name="**/xom/**"/>
+ <exclude name="**/xpath/**"/>
+ <exclude name="**/xqj/**"/>
+ </fileset>
+ <!--
+ <fileset dir="${source-saj.dir}">
+ <include name="com/saxonica/extra/*.java"/>
+ <include name="com/saxonica/fsa/*.java"/>
+ <include name="com/saxonica/ptree/*.java"/>
+ <include name="com/saxonica/schema/*.java"/>
+ <include name="com/saxonica/sdoc/*.java"/>
+ <include name="com/saxonica/validate/*.java"/>
+ <include name="com/saxonica/Validate.java"/>
+ </fileset>-->
+ </copy>
+ <!--
+ <replace file="${temp-src-nj.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
+ token="/*JAVAONLY*/"
+ value="//"
+ summary="yes"/>
+ -->
+ <replace file="${temp-src-nj.dir}/net/sf/saxon/Configuration.java"
+ token="/*JAVAONLY*/"
+ value="//"
+ summary="yes"/>
+ <!-- when building from development source
+ <copy todir="${temp-src-nc.dir}/api">
+ <fileset dir="${source-api-n.dir}">
+ <include name="Saxon.Api/*.cs"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${temp-src-nc.dir}/cmd">
+ <fileset dir="${source-cmd-n.dir}/Transform">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-cmd-n.dir}/Query">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-cmd-n.dir}/Validate">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ <copy todir="${temp-src-nc.dir}/samples">
+ <fileset dir="${source-samples-n.dir}/XQueryExamples">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/XPathExample">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/XsltExamples">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/SchemaExamples">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/XsltTestSuiteDriver">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/XQueryTestSuiteDriver">
+ <include name="*.cs"/>
+ </fileset>
+ <fileset dir="${source-samples-n.dir}/SampleExtensions">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ -->
+ <!-- when building from patch source
+ <copy todir="${temp-src-nc.dir}/api/Saxon.Api">
+ <fileset dir="${source-api-n.dir}">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ <copy todir="${temp-src-nc.dir}/cmd" >
+ <fileset dir="${source-cmd-n.dir}">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ <copy todir="${temp-src-nc.dir}/samples">
+ <fileset dir="${source-samples-n.dir}">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ -->
+ <!-- -->
+
+ </target>
+
+ <target name="create-meta-inf" description="Create contents of META-INF/services files">
+
+ <!-- given the Ant 1.7.0 bug, create the services files here for copying into the JARS -->
+ <mkdir dir="${services.dir}/saxon9/META-INF/services"/>
+ <echo file="${services.dir}/saxon9/META-INF/services/javax.xml.transform.TransformerFactory"
+ message="net.sf.saxon.TransformerFactoryImpl"/>
+ <mkdir dir="${services.dir}/saxon9-xpath/META-INF/services"/>
+ <echo file="${services.dir}/saxon9-xpath/META-INF/services/javax.xml.xpath.XPathFactory"
+>net.sf.saxon.xpath.XPathFactoryImpl
+http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl
+http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl
+http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl
+http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl
+http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl
+</echo>
+ <mkdir dir="${services.dir}/saxon9sa/META-INF/services"/>
+ <echo file="${services.dir}/saxon9sa/META-INF/services/javax.xml.transform.TransformerFactory"
+ message="com.saxonica.SchemaAwareTransformerFactory"/>
+ <mkdir dir="${services.dir}/saxon9sa-jaxp/META-INF/services"/>
+ <echo file="${services.dir}/saxon9sa-jaxp/META-INF/services/javax.xml.validation.SchemaFactory"
+>com.saxonica.jaxp.SchemaFactoryImpl
+http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
+</echo>
+
+
+ </target>
+
+ <target name="compile-bj" description="Compile Saxon-B classes for Java." depends="copysource-development">
+ <mkdir dir="${classes-j.dir}"/>
+ <javac encoding="ISO-8859-1" debug="${build.debug}" debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}" destdir="${classes-j.dir}"
+ optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"
+ target="${build.compiler.target}">
+
+ <include name="net/**"/>
+ <exclude name="**/dom/**"/>
+ <exclude name="**/dom4j/**"/>
+ <exclude name="**/javax/**"/>
+ <exclude name="**/jdom/**"/>
+ <exclude name="**/sql/**"/>
+ <exclude name="**/xom/**"/>
+ <exclude name="**/xpath/**"/>
+ <exclude name="**/xqj/**"/>
+ <exclude name="**/dotnet/**"/>
+ <exclude name="**/s9api/**"/>
+
+ <exclude name="**/ant/**"/>
+ <exclude name="**/dotnet/**"/>
+ <exclude name="**/s9api/**"/>
+ <classpath>
+ <path refid="classpath-j"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-saj" description="Compile Saxon-SA classes for Java." depends="copysource-development">
+ <mkdir dir="${classes-j.dir}"/>
+ <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}" destdir="${classes-j.dir}"
+ optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"
+ target="${build.compiler.target}">
+
+ <include name="com/saxonica/**"/>
+ <include name="net/sf/saxon/ant/**"/>
+ <exclude name="com/saxonica/validate/DotNetVerifier.java"/>
+ <classpath>
+ <path refid="classpath-j"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-s9api" description="Compile s9api classes for Java."
+ depends="compile-bj, compile-saj, copysource-development">
+ <!-- Compiling the s9api package requires JDK 1.5 -->
+ <!-- The bj and saj source must be compiled first to ensure that it is done using 1.4, otherwise
+ it will be compiled in 1.5 mode because the classes are referenced from the s9api package -->
+ <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}" destdir="${classes-j.dir}"
+ optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.s9api.compiler.source}"
+ target="${build.s9api.compiler.target}">
+
+ <include name="**/s9api/**"/>
+ <classpath>
+ <path refid="classpath-j"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-bn" description="Compile Saxon-B classes for .NET" depends="copysource-development">
+ <mkdir dir="${classes-n.dir}"/>
+ <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}" destdir="${classes-n.dir}"
+ optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"
+ target="${build.compiler.target}">
+
+ <include name="net/**"/>
+ <exclude name="**/s9api/**"/>
+ <classpath>
+ <path refid="classpath-n"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-san" description="Compile Saxon-SA classes for .NET" depends="copysource-development">
+ <mkdir dir="${classes-n.dir}"/>
+ <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}" destdir="${classes-n.dir}"
+ optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"
+ target="${build.compiler.target}">
+
+ <include name="com/saxonica/**"/>
+ <exclude name="com/saxonica/validate/JavaVerifier.java"/>
+ <classpath>
+ <path refid="classpath-n"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="jar-bj" description="Create Saxon-B jar files for Java" depends="create-meta-inf, compile-bj">
+ <mkdir dir="${product.dir}/bj"/>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9.jar">
+ <include name="net/**/*.class"/>
+ <exclude name="**/ant/**/*.class"/>
+ <exclude name="**/dom/**/*.class"/>
+ <exclude name="**/dom4j/**/*.class"/>
+ <exclude name="**/javax/**/*.class"/>
+ <exclude name="**/jdom/**/*.class"/>
+ <exclude name="**/sql/**/*.class"/>
+ <exclude name="**/xom/**/*.class"/>
+ <exclude name="**/xpath/**/*.class"/>
+ <exclude name="**/xqj/**/*.class"/>
+ <exclude name="**/s9api/**/*.class"/>
+ <include name="META-INF/**"/>
+ <manifest>
+ <attribute name="Project-Name" value="Saxon-B"/>
+ <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
+ </manifest>
+ <metainf dir="${services.dir}/saxon9/META-INF"/>
+ <!--
+ <service type="javax.xml.transform.TransformerFactory"
+ provider="net.sf.saxon.TransformerFactoryImpl"/>
+ -->
+ </jar>
+ <!--
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-dom.jar">
+ <include name="net/sf/saxon/dom/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-dom4j.jar">
+ <include name="net/sf/saxon/dom4j/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-jdom.jar">
+ <include name="net/sf/saxon/jdom/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-s9api.jar">
+ <include name="net/sf/saxon/s9api/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-sql.jar">
+ <include name="net/sf/saxon/sql/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xom.jar">
+ <include name="net/sf/saxon/xom/*.class"/>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xpath.jar">
+ <include name="net/sf/saxon/xpath/*.class"/>
+ <metainf dir="${services.dir}/saxon9-xpath/META-INF"/>
+ <!==
+ <service type="javax.xml.xpath.XPathFactory">
+ <provider classname="net.sf.saxon.xpath.XPathFactoryImpl"/>
+ <provider classname="http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl"/>
+ <provider classname="http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl"/>
+ <provider classname="http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl"/>
+ <provider classname="http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl"/>
+ <provider classname="http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl"/>
+ </service> ==>
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xqj.jar">
+ <include name="net/sf/saxon/xqj/*.class"/>
+ <include name="net/sf/saxon/javax/xml/namespace/*.class"/>
+ <include name="net/sf/saxon/javax/xml/xquery/*.class"/>
+ </jar>
+ -->
+ </target>
+
+ <target name="jar-saj" description="Create Saxon-SA jar files for Java" depends="compile-s9api, jar-bj">
+ <mkdir dir="${product.dir}/saj"/>
+ <copy todir="${product.dir}/saj">
+ <fileset dir="${product.dir}/bj">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa.jar">
+ <include name="net/**/*.class"/>
+ <exclude name="**/dom/**/*.class"/>
+ <exclude name="**/dom4j/**/*.class"/>
+ <exclude name="**/javax/**/*.class"/>
+ <exclude name="**/jdom/**/*.class"/>
+ <exclude name="**/s9api/**/*.class"/>
+ <exclude name="**/sql/**/*.class"/>
+ <exclude name="**/xom/**/*.class"/>
+ <exclude name="**/xpath/**/*.class"/>
+ <exclude name="**/xqj/**/*.class"/>
+ <include name="com/saxonica/**/*.class"/>
+ <exclude name="com/saxonica/jaxp/*.class"/>
+ <exclude name="com.saxonica.CompileQuery.class"/>
+ <manifest>
+ <attribute name="Project-Name" value="Saxon-SA"/>
+ </manifest>
+ <metainf dir="${services.dir}/saxon9sa/META-INF"/>
+ <!--
+ <service type="javax.xml.transform.TransformerFactory"
+ provider="com.saxonica.SchemaAwareTransformerFactory"/>
+ -->
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-jaxp.jar">
+ <include name="com/saxonica/jaxp/*.class"/>
+ <include name="net/sf/saxon/dom/TypeInfoImpl.class"/>
+ <metainf dir="${services.dir}/saxon9sa-jaxp/META-INF"/>
+ <!--
+ <service type="javax.xml.validation.SchemaFactory">
+ <provider classname="com.saxonica.jaxp.SchemaFactoryImpl"/>
+ <provider classname="http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl"/>
+ </service>
+ -->
+ </jar>
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-qc.jar">
+ <include name="com/saxonica/codegen/*.class"/>
+ <include name="com.saxonica.CompileQuery.class"/>
+ </jar>
+ <!-- The Saxon-Ant task is delivered with Saxon-B but it won't compile without Saxon-SA present,
+ unless modified -->
+ <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-ant.jar">
+ <include name="net/sf/saxon/ant/*.class"/>
+ </jar>
+ </target>
+
+ <target name="jar-bn" description="Create Saxon-B jar files for .NET" depends="compile-bn">
+ <mkdir dir="${jar-n.dir}"/>
+ <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9.jar">
+ <include name="net/**/*.class"/>
+ </jar>
+ </target>
+
+ <target name="jar-san" description="Create Saxon-SA jar files for .NET" depends="compile-san">
+ <mkdir dir="${jar-n.dir}"/>
+ <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9sa.jar">
+ <include name="com/saxonica/**/*.class"/>
+ </jar>
+ </target>
+
+ <target name="dll-n" description="Create DLLs for .NET" depends="jar-bn, jar-san">
+ <mkdir dir="${dll-n.dir}"/>
+ <copy todir="${dll-n.dir}">
+ <fileset dir="${ikvm.dir}/bin">
+ <include name="IKVM.GNU.Classpath.dll"/>
+ <include name="IKVM.Runtime.dll"/>
+ </fileset>
+ </copy>
+ <copy file="${saxondotnet.snk}" todir="${basedir}"/>
+ <!--
+ Invoke IKVMC to cross-compile the JAR files into DLLs
+ -->
+ <exec dir="." executable="ikvmc.cmd" >
+ <arg line="live"/> <!-- set to 'debug' for testing, 'live' for final build -->
+ <arg line="${basedir}/${jar-n.dir}"/>
+ <arg line="${basedir}/${dll-n.dir}"/>
+ <arg line="${version}"/>
+ </exec>
+ </target>
+
+ <target name="csharp-n" description="Compile C# source for .NET commands and API library"
+ depends="dll-n">
+
+ <mkdir dir="${dll-n.dir}/samples"/>
+ <mkdir dir="${dll-n.dir}/tests"/>
+
+ <exec dir="." executable="csharp-compile.cmd" >
+ <arg line="${basedir}/${temp-src-nc.dir}"/>
+ <arg line="${basedir}/${dll-n.dir}"/>
+ <arg line="${version}"/>
+ </exec>
+
+
+<!-- <taskdef
+ uri="antlib:org.apache.ant.dotnet">
+ <classpath>
+ <pathelement location="c:/javalib/ant-dotnet-1.0/ant-dotnet-1.0.jar"/>
+ </classpath>
+ </taskdef>
+ <dn:csc xmlns:dn="antlib:org.apache.ant.dotnet"
+ executable="${csharp.compiler}"
+ srcdir="${temp-src-nc.dir}/cmd"
+ targettype="exe"
+ win32icon="c:\MyDotNet\icons\gyfu.ico"
+ destdir="${dll-n.dir}">
+ <reference file="${dll-n.dir}/IKVM.GNU.Classpath.dll"/>
+ <reference file="${dll-n.dir}/IKVM.Runtime.dll"/>
+ <reference file="${dll-n.dir}/saxon9.dll"/>
+ <reference file="${dll-n.dir}/saxon9sa.dll"/>
+ </dn:csc>
+ <dn:csc xmlns:dn="antlib:org.apache.ant.dotnet"
+ executable="${csharp.compiler}"
+ srcdir="${temp-src-nc.dir}/api"
+ targettype="module"
+ win32icon="c:\MyDotNet\icons\gyfu.ico"
+ destdir="${dll-n.dir}">
+ <reference file="${dll-n.dir}/IKVM.GNU.Classpath.dll"/>
+ <reference file="${dll-n.dir}/IKVM.Runtime.dll"/>
+ <reference file="${dll-n.dir}/saxon9.dll"/>
+ <reference file="${dll-n.dir}/saxon9sa.dll"/>
+ </dn:csc>
+-->
+ </target>
+
+ <target name="basic-userdoc" description="Generate Basic Documentation for release with executable">
+ <mkdir dir="${product.dir}/bj"/>
+ <copy todir="${product.dir}/bj">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${product.dir}/saj"/>
+ <copy todir="${product.dir}/saj">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${product.dir}/bn"/>
+ <copy todir="${product.dir}/bn">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${product.dir}/san"/>
+ <copy todir="${product.dir}/san">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="product-bn" description="Assemble product.directory for Saxon-B on .NET"
+ depends="csharp-n, dll-n, basic-userdoc">
+ <mkdir dir="${build-bn.dir}/bin"/>
+ <copy todir="${build-bn.dir}/bin">
+ <fileset dir="${dll-n.dir}">
+ <include name="IKVM.GNU.Classpath.dll"/>
+ <include name="IKVM.Runtime.dll"/>
+ <include name="saxon9.dll"/>
+ <include name="saxon9api.dll"/>
+ <include name="saxon9api.netmodule"/>
+ <include name="Query.exe"/>
+ <include name="Transform.exe"/>
+ </fileset>
+ </copy>
+ <echo file="${build-bn.dir}/bin/install-gac.cmd">
+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin"
+ %NET%\gacutil /if IKVM.Runtime.dll
+ %NET%\gacutil /if IKVM.GNU.Classpath.dll
+ %NET%\gacutil /if saxon9.dll
+ %NET%\gacutil /if saxon9api.dll
+ </echo>
+ </target>
+
+ <target name="product-san" description="Assemble product.directory for Saxon-SA on .NET"
+ depends="csharp-n, dll-n, basic-userdoc">
+ <copy todir="${build-san.dir}/bin">
+ <fileset dir="${dll-n.dir}">
+ <include name="IKVM.GNU.Classpath.dll"/>
+ <include name="IKVM.Runtime.dll"/>
+ <include name="saxon9.dll"/>
+ <include name="saxon9sa.dll"/>
+ <include name="saxon9api.dll"/>
+ <include name="saxon9api.netmodule"/>
+ <include name="Query.exe"/>
+ <include name="Transform.exe"/>
+ <include name="Validate.exe"/>
+ </fileset>
+ </copy>
+ <echo file="${build-san.dir}/bin/install-gac.cmd">
+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin"
+ %NET%\gacutil /if IKVM.Runtime.dll
+ %NET%\gacutil /if IKVM.GNU.Classpath.dll
+ %NET%\gacutil /if saxon9.dll
+ %NET%\gacutil /if saxon9sa.dll
+ %NET%\gacutil /if saxon9api.dll
+ </echo>
+ </target>
+
+ <target name="samples" description="Assemble Cross-Platform Samples and Use-Cases">
+ <mkdir dir="${build-resources.dir}/samples"/>
+ <copy todir="${product.dir}/resources/use-cases">
+ <fileset dir="${usercases.dir}"/>
+ </copy>
+ <copy todir="${product.dir}/resources/samples">
+ <fileset dir="${samples.dir}">
+ <include name="analysis/timing-profile.xsl"/>
+ <include name="data/*.xml"/>
+ <include name="data/*.xsd"/>
+ <include name="data/*.dtd"/>
+ <include name="query/*.xq"/>
+ <include name="styles/*.xsl"/>
+ <include name="trax/xml/**/*.xml"/>
+ <include name="trax/xsl/**/*.xsl"/>
+ <include name="trax/xsl/**/preamble.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="samples-j" description="Copy and Compile Java Samples"
+ depends="jar-saj">
+ <mkdir dir="${product.dir}/resources/samples/java"/>
+ <mkdir dir="${product.dir}/resources/samples/java/classes"/>
+ <copy todir="${product.dir}/resources/samples/java">
+ <fileset dir="${samples.dir}/java">
+ <include name="ApplyXPathJAXP.java"/>
+ <include name="ExampleContentHandler.java"/>
+ <include name="JDOMExample.java"/>
+ <include name="PullExamples.java"/>
+ <include name="QueryAPIExamples.java"/>
+ <include name="QuickValidator.java"/>
+ <include name="SaxonServlet.java"/>
+ <include name="SaxonSAServlet.java"/>
+ <include name="SchemaValidatorExample.java"/>
+ <include name="SchemaValidatorHandlerExample.java"/>
+ <include name="TraxExamples.java"/>
+ <include name="XMarkBenchmark.java"/>
+ <include name="XPathExample.java"/>
+ <include name="XPathExampleDOM.java"/>
+ <include name="XPathExampleSA.java"/>
+ <include name="XPathExampleServlet.java"/>
+ <include name="XQJExamples.java"/>
+ </fileset>
+ </copy>
+ <javac debug="true" debuglevel="source, lines"
+ destdir="${product.dir}/resources/samples/java/classes"
+ srcdir="${product.dir}/resources/samples/java"
+ source="${build.compiler.source}"
+ target="${build.compiler.target}">
+ <include name="*.java"/>
+ <classpath>
+ <path refid="classpath-samples"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="testdrivers-j" description="Copy Java Test Drivers">
+ <mkdir dir="${product.dir}/resources/drivers/java/test"/>
+ <copy todir="${product.dir}/resources/drivers/java/test">
+ <fileset dir="${drivers-j.dir}">
+ <include name="XQueryTestSuiteDriver.java"/>
+ <include name="XsltTestSuiteDriver.java"/>
+ <include name="CanonicalXML.java"/>
+ <include name="XQTSModuleURIResolver.java"/>
+ <include name="XQTSCollectionURIResolver.java"/>
+ <include name="SchemaTestSuiteDriver.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="samples-n" description="Assemble release samples for .NET"
+ depends="csharp-n">
+ <mkdir dir="${build-resources.dir}/samples/cs"/>
+ <copy todir="${build-resources.dir}/samples/cs">
+ <fileset dir="${temp-src-nc.dir}/samples">
+ <include name="*.cs"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${build-resources.dir}/samples/cs/bin"/>
+ <copy todir="${build-resources.dir}/samples/cs/bin">
+ <fileset dir="${dll-n.dir}/samples">
+ <include name="*.exe"/>
+ <include name="*.dll"/>
+ <include name="*.pdb"/>
+ </fileset>
+ </copy>
+ <copy todir="${build-resources.dir}/samples/cs/bin">
+ <fileset dir="${dll-n.dir}/tests">
+ <include name="*.exe"/>
+ <include name="*.dll"/>
+ <include name="*.pdb"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="product-javadoc" description="Generate Javadoc.">
+ <javadoc bottom="Copyright (C) Michael H. Kay. All rights reserved."
+ destdir="${javadoc.dir}" doctitle="saxon9 Javadocs"
+ noindex="true" notree="true" access="public"
+ maxmemory="512M" source="1.5">
+ <packageset dir="${temp-src-j.dir}">
+ <include name="net/**"/>
+ <include name="com/**"/>
+ <exclude name="**/dotnet/**"/>
+ <exclude name="**/DotNetVerifier.java"/>
+ </packageset>
+ <classpath>
+ <path refid="classpath-j"/>
+ </classpath>
+
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+ <link href="http://www.xom.nu/apidocs/"/>
+
+ </javadoc>
+ <copy file="${userdoc.dir}/fixed/javadoc/stylesheet.css"
+ tofile="${javadoc.dir}/stylesheet.css"
+ overwrite="true"/>
+ </target>
+
+ <target name="product-dotnetdoc" description="Copy .NET API documentation">
+ <mkdir dir="${build-resources.dir}/doc/dotnetdoc"/>
+ <copy todir="${build-resources.dir}/doc/dotnetdoc">
+ <fileset dir="${dotnetdoc.dir}"/>
+ </copy>
+ </target>
+
+
+ <target name="release-userdoc" description="Generate User Documentation">
+ <taskdef name="saxon-xslt"
+ classname="net.sf.saxon.ant.AntTransform"
+ classpath="c:\saxon-build\9.0.0.1\saj\saxon9sa.jar;c:\saxon-licenses"/>
+ <copy todir="${build-resources.dir}/doc">
+ <fileset dir="${userdoc.dir}/fixed"/>
+ </copy>
+ <copy todir="${product.dir}/bj">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${product.dir}/saj">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${product.dir}/bn">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${product.dir}/san">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="doc/**"/>
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ <saxon-xslt in="${userdoc.dir}/catalog.xml"
+ style="${userdoc.dir}/render-page2.xsl"
+ schemaAware="true"
+ xmlVersion="1.0"
+ schemaValidation="strict"
+ out="${product.dir}/resources/doc/dummy.html"><!--validation="strict" -->
+ <param name="destination" expression="offline"/>
+ </saxon-xslt>
+ <zip zipfile="${build-resources.dir}/source-userdoc.zip">
+ <fileset dir="${userdoc.dir}">
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.css"/>
+ <include name="fixed/**"/>
+ <include name="welcome/**"/>
+ </fileset>
+ </zip>
+ </target>
+
+ <target name="release-source" description="Generate Zip file containing issued Source Code">
+ <mkdir dir="${build-resources.dir}"/>
+ <zip zipfile="${build-resources.dir}/source.zip">
+ <fileset dir="${source-bj.dir}">
+ <include name="net/**/*.java"/>
+ <include name="net/**/package.html"/>
+ </fileset>
+ <fileset dir="${source-bj.dir}">
+ <include name="net/sf/saxon/dotnet/*.java"/>
+ <include name="net/sf/saxon/dotnet/package.html"/>
+ </fileset>
+ <fileset dir="${temp-src-nc.dir}">
+ <include name="api/**/*.cs"/>
+ <include name="cmd/**/*.cs"/>
+ </fileset>
+ </zip>
+ <zip zipfile="${build-resources.dir}/sa-source.zip">
+ <fileset dir="${source-saj.dir}">
+ <include name="com/saxonica/**/*.java"/>
+ <include name="com/saxonica/**/package.html"/>
+ </fileset>
+ </zip>
+ </target>
+
+ <target name="resources" description="Generate contents of released resources file"
+ depends="release-userdoc, product-javadoc, product-dotnetdoc,
+ samples, samples-j, testdrivers-j, samples-n, release-source">
+ <mkdir dir="${product.dir}/resources/build"/>
+ <copy todir="${product.dir}/resources/build">
+ <fileset dir="${basedir}">
+ <include name="build.xml"/>
+ <include name="ikvmc.cmd"/>
+ <include name="csharp-compile.cmd"/>
+ </fileset>
+ </copy>
+ <copy todir="${product.dir}/resources">
+ <fileset dir="${userdoc.dir}/welcome">
+ <include name="notices/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="bj" depends="compile-bj, jar-bj, basic-userdoc"
+ description="Generate Saxon-B for the Java platform"/>
+
+ <target name="saj" depends="bj, jar-saj, basic-userdoc"
+ description="Generate Saxon-SA for the Java platform"/>
+
+ <target name="n" depends="product-bn, product-san"
+ description="Generate Saxon for the .NET platform"/>
+
+ <target name="build" description="Complete Saxon product build"
+ depends="bj, saj, n"/> <!-- add resources -->
+
+ <target name="release" description="Create .ZIP files for release" depends="build"
+ > <!--depends="build, resources"-->
+ <mkdir dir="${issue.dir}"/>
+ <zip zipfile="${issue.dir}/saxonb${versionh}j.zip">
+ <fileset dir="${product.dir}/bj"/>
+ </zip>
+ <zip zipfile="${issue.dir}/saxonb${versionh}n.zip">
+ <fileset dir="${product.dir}/bn"/>
+ </zip>
+ <zip zipfile="${issue.dir}/saxonsa${versionh}j.zip">
+ <fileset dir="${product.dir}/saj"/>
+ </zip>
+ <zip zipfile="${issue.dir}/saxonsa${versionh}n.zip">
+ <fileset dir="${product.dir}/san"/>
+ </zip>
+ <!--
+ <zip zipfile="${issue.dir}/saxon-resources${versionh}.zip">
+ <fileset dir="${product.dir}/resources"/>
+ </zip>
+ -->
+ </target>
+
+ <target name="archive" description="Archive everything needed for backup">
+ <mkdir dir="${archive.dir}"/>
+ <copy todir="${archive.dir}">
+ <fileset dir="${issue.dir}"/>
+ <fileset dir="${development-j.dir}" includes="sa-source.zip"/>
+ <fileset dir="${build-resources.dir}" includes="source.zip"/>
+ </copy>
+ <zip zipfile="${archive.dir}/saxontests.zip">
+ <fileset dir="e:/tests">
+ <include name="testsuite/*.*"/>
+ <include name="java/**/*.java"/>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list