[Libreoffice-commits] .: Branch 'feature/gnumake4' - 126 commits - autodoc/inc autodoc/prj autodoc/source cosv/inc cosv/prj cosv/source .gitignore odk/cfgWin.js odk/configure.pl odk/docs odk/examples odk/inc odk/pack odk/prj odk/setsdkenv_unix odk/setsdkenv_unix.csh.in odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/settings odk/source odk/util udm/inc udm/prj udm/source unodevtools/inc unodevtools/prj unodevtools/source unodevtools/unodevtools.pmk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Wed Jun 22 10:23:22 PDT 2011
.gitignore | 17
autodoc/inc/ary/actions.hxx | 2
autodoc/inc/ary/ary.hxx | 3
autodoc/inc/ary/ary_disp.hxx | 3
autodoc/inc/ary/arygroup.hxx | 3
autodoc/inc/ary/ceslot.hxx | 3
autodoc/inc/ary/cessentl.hxx | 3
autodoc/inc/ary/cpp/c_builtintype.hxx | 3
autodoc/inc/ary/cpp/c_ce.hxx | 3
autodoc/inc/ary/cpp/c_class.hxx | 3
autodoc/inc/ary/cpp/c_cppentity.hxx | 3
autodoc/inc/ary/cpp/c_de.hxx | 3
autodoc/inc/ary/cpp/c_define.hxx | 3
autodoc/inc/ary/cpp/c_enum.hxx | 3
autodoc/inc/ary/cpp/c_enuval.hxx | 3
autodoc/inc/ary/cpp/c_funct.hxx | 3
autodoc/inc/ary/cpp/c_gate.hxx | 3
autodoc/inc/ary/cpp/c_macro.hxx | 3
autodoc/inc/ary/cpp/c_namesp.hxx | 3
autodoc/inc/ary/cpp/c_osigna.hxx | 3
autodoc/inc/ary/cpp/c_slntry.hxx | 3
autodoc/inc/ary/cpp/c_traits.hxx | 3
autodoc/inc/ary/cpp/c_tydef.hxx | 3
autodoc/inc/ary/cpp/c_type.hxx | 3
autodoc/inc/ary/cpp/c_types4cpp.hxx | 3
autodoc/inc/ary/cpp/c_vari.hxx | 3
autodoc/inc/ary/cpp/c_vfflag.hxx | 3
autodoc/inc/ary/cpp/cp_ce.hxx | 3
autodoc/inc/ary/cpp/cp_def.hxx | 3
autodoc/inc/ary/cpp/cp_type.hxx | 3
autodoc/inc/ary/cpp/inpcontx.hxx | 3
autodoc/inc/ary/cpp/namechain.hxx | 3
autodoc/inc/ary/cpp/usedtype.hxx | 3
autodoc/inc/ary/doc/d_boolean.hxx | 3
autodoc/inc/ary/doc/d_docu.hxx | 3
autodoc/inc/ary/doc/d_node.hxx | 3
autodoc/inc/ary/doc/d_oldcppdocu.hxx | 3
autodoc/inc/ary/doc/d_oldidldocu.hxx | 3
autodoc/inc/ary/doc/d_parametrized.hxx | 3
autodoc/inc/ary/doc/d_types4doc.hxx | 3
autodoc/inc/ary/doc/ht/dht_interpreter.hxx | 3
autodoc/inc/ary/entity.hxx | 3
autodoc/inc/ary/getncast.hxx | 3
autodoc/inc/ary/idl/i_attribute.hxx | 3
autodoc/inc/ary/idl/i_ce.hxx | 3
autodoc/inc/ary/idl/i_ce2s.hxx | 4
autodoc/inc/ary/idl/i_comrela.hxx | 3
autodoc/inc/ary/idl/i_constant.hxx | 3
autodoc/inc/ary/idl/i_constgroup.hxx | 3
autodoc/inc/ary/idl/i_enum.hxx | 3
autodoc/inc/ary/idl/i_enumvalue.hxx | 3
autodoc/inc/ary/idl/i_exception.hxx | 3
autodoc/inc/ary/idl/i_function.hxx | 3
autodoc/inc/ary/idl/i_gate.hxx | 3
autodoc/inc/ary/idl/i_interface.hxx | 3
autodoc/inc/ary/idl/i_module.hxx | 3
autodoc/inc/ary/idl/i_namelookup.hxx | 3
autodoc/inc/ary/idl/i_param.hxx | 3
autodoc/inc/ary/idl/i_property.hxx | 3
autodoc/inc/ary/idl/i_service.hxx | 3
autodoc/inc/ary/idl/i_singleton.hxx | 3
autodoc/inc/ary/idl/i_siservice.hxx | 3
autodoc/inc/ary/idl/i_sisingleton.hxx | 3
autodoc/inc/ary/idl/i_struct.hxx | 3
autodoc/inc/ary/idl/i_structelem.hxx | 3
autodoc/inc/ary/idl/i_traits.hxx | 3
autodoc/inc/ary/idl/i_type.hxx | 5
autodoc/inc/ary/idl/i_typedef.hxx | 3
autodoc/inc/ary/idl/i_types4idl.hxx | 3
autodoc/inc/ary/idl/ik_attribute.hxx | 3
autodoc/inc/ary/idl/ik_ce.hxx | 2
autodoc/inc/ary/idl/ik_constant.hxx | 2
autodoc/inc/ary/idl/ik_constgroup.hxx | 2
autodoc/inc/ary/idl/ik_enum.hxx | 2
autodoc/inc/ary/idl/ik_enumvalue.hxx | 3
autodoc/inc/ary/idl/ik_exception.hxx | 2
autodoc/inc/ary/idl/ik_function.hxx | 2
autodoc/inc/ary/idl/ik_interface.hxx | 15
autodoc/inc/ary/idl/ik_module.hxx | 3
autodoc/inc/ary/idl/ik_property.hxx | 3
autodoc/inc/ary/idl/ik_service.hxx | 3
autodoc/inc/ary/idl/ik_singleton.hxx | 3
autodoc/inc/ary/idl/ik_siservice.hxx | 3
autodoc/inc/ary/idl/ik_sisingleton.hxx | 3
autodoc/inc/ary/idl/ik_struct.hxx | 2
autodoc/inc/ary/idl/ik_structelem.hxx | 3
autodoc/inc/ary/idl/ik_typedef.hxx | 3
autodoc/inc/ary/idl/ip_ce.hxx | 3
autodoc/inc/ary/idl/ip_type.hxx | 3
autodoc/inc/ary/info/all_dts.hxx | 2
autodoc/inc/ary/info/all_tags.hxx | 2
autodoc/inc/ary/info/ci_attag.hxx | 2
autodoc/inc/ary/info/ci_text.hxx | 2
autodoc/inc/ary/info/docstore.hxx | 3
autodoc/inc/ary/info/infodisp.hxx | 3
autodoc/inc/ary/info/inftypes.hxx | 2
autodoc/inc/ary/itrange.hxx | 3
autodoc/inc/ary/loc/loc_dir.hxx | 3
autodoc/inc/ary/loc/loc_file.hxx | 3
autodoc/inc/ary/loc/loc_filebase.hxx | 3
autodoc/inc/ary/loc/loc_le.hxx | 3
autodoc/inc/ary/loc/loc_root.hxx | 3
autodoc/inc/ary/loc/loc_traits.hxx | 3
autodoc/inc/ary/loc/loc_types4loc.hxx | 3
autodoc/inc/ary/loc/locp_le.hxx | 3
autodoc/inc/ary/namesort.hxx | 3
autodoc/inc/ary/object.hxx | 3
autodoc/inc/ary/qualiname.hxx | 3
autodoc/inc/ary/sequentialids.hxx | 3
autodoc/inc/ary/stdconstiter.hxx | 3
autodoc/inc/ary/symtreenode.hxx | 3
autodoc/inc/ary/types.hxx | 3
autodoc/inc/ary/udmhost.hxx | 3
autodoc/inc/ary_i/ci_atag2.hxx | 2
autodoc/inc/ary_i/ci_text2.hxx | 2
autodoc/inc/ary_i/d_token.hxx | 2
autodoc/inc/ary_i/disdocum.hxx | 2
autodoc/inc/autodoc/displaying.hxx | 2
autodoc/inc/autodoc/dsp_html_std.hxx | 3
autodoc/inc/autodoc/dsp_txt_flist.hxx | 2
autodoc/inc/autodoc/filecoli.hxx | 2
autodoc/inc/autodoc/parsing.hxx | 2
autodoc/inc/autodoc/prs_code.hxx | 3
autodoc/inc/autodoc/prs_docu.hxx | 2
autodoc/inc/autodoc/x_parsing.hxx | 3
autodoc/inc/display/corframe.hxx | 2
autodoc/inc/parser/parser.hxx | 2
autodoc/inc/parser/parserinfo.hxx | 3
autodoc/inc/parser/unoidl.hxx | 2
autodoc/prj/d.lst | 4
autodoc/source/ary/cpp/c_builtintype.cxx | 3
autodoc/source/ary/cpp/c_class.cxx | 3
autodoc/source/ary/cpp/c_de.cxx | 3
autodoc/source/ary/cpp/c_define.cxx | 3
autodoc/source/ary/cpp/c_enum.cxx | 3
autodoc/source/ary/cpp/c_enuval.cxx | 3
autodoc/source/ary/cpp/c_funct.cxx | 3
autodoc/source/ary/cpp/c_macro.cxx | 3
autodoc/source/ary/cpp/c_namesp.cxx | 5
autodoc/source/ary/cpp/c_osigna.cxx | 3
autodoc/source/ary/cpp/c_reposypart.cxx | 3
autodoc/source/ary/cpp/c_reposypart.hxx | 3
autodoc/source/ary/cpp/c_slots.cxx | 3
autodoc/source/ary/cpp/c_slots.hxx | 3
autodoc/source/ary/cpp/c_traits.cxx | 3
autodoc/source/ary/cpp/c_tydef.cxx | 3
autodoc/source/ary/cpp/c_vari.cxx | 3
autodoc/source/ary/cpp/ca_ce.cxx | 3
autodoc/source/ary/cpp/ca_ce.hxx | 3
autodoc/source/ary/cpp/ca_def.cxx | 3
autodoc/source/ary/cpp/ca_def.hxx | 3
autodoc/source/ary/cpp/ca_type.cxx | 3
autodoc/source/ary/cpp/ca_type.hxx | 3
autodoc/source/ary/cpp/cs_ce.cxx | 3
autodoc/source/ary/cpp/cs_ce.hxx | 3
autodoc/source/ary/cpp/cs_def.cxx | 3
autodoc/source/ary/cpp/cs_def.hxx | 3
autodoc/source/ary/cpp/cs_type.cxx | 3
autodoc/source/ary/cpp/cs_type.hxx | 3
autodoc/source/ary/cpp/namechain.cxx | 3
autodoc/source/ary/cpp/tplparam.cxx | 3
autodoc/source/ary/cpp/tplparam.hxx | 3
autodoc/source/ary/cpp/usedtype.cxx | 3
autodoc/source/ary/doc/d_boolean.cxx | 3
autodoc/source/ary/doc/d_docu.cxx | 3
autodoc/source/ary/doc/d_node.cxx | 3
autodoc/source/ary/doc/d_oldcppdocu.cxx | 3
autodoc/source/ary/doc/d_oldidldocu.cxx | 3
autodoc/source/ary/idl/i2s_calculator.cxx | 24
autodoc/source/ary/idl/i2s_calculator.hxx | 3
autodoc/source/ary/idl/i_attribute.cxx | 3
autodoc/source/ary/idl/i_ce.cxx | 17
autodoc/source/ary/idl/i_ce2s.cxx | 3
autodoc/source/ary/idl/i_comrela.cxx | 3
autodoc/source/ary/idl/i_constant.cxx | 3
autodoc/source/ary/idl/i_constgroup.cxx | 3
autodoc/source/ary/idl/i_enum.cxx | 3
autodoc/source/ary/idl/i_enumvalue.cxx | 3
autodoc/source/ary/idl/i_exception.cxx | 3
autodoc/source/ary/idl/i_function.cxx | 3
autodoc/source/ary/idl/i_interface.cxx | 3
autodoc/source/ary/idl/i_module.cxx | 3
autodoc/source/ary/idl/i_namelookup.cxx | 3
autodoc/source/ary/idl/i_nnfinder.hxx | 3
autodoc/source/ary/idl/i_param.cxx | 3
autodoc/source/ary/idl/i_property.cxx | 3
autodoc/source/ary/idl/i_reposypart.cxx | 3
autodoc/source/ary/idl/i_reposypart.hxx | 3
autodoc/source/ary/idl/i_service.cxx | 3
autodoc/source/ary/idl/i_singleton.cxx | 3
autodoc/source/ary/idl/i_siservice.cxx | 3
autodoc/source/ary/idl/i_sisingleton.cxx | 3
autodoc/source/ary/idl/i_struct.cxx | 3
autodoc/source/ary/idl/i_structelem.cxx | 3
autodoc/source/ary/idl/i_traits.cxx | 3
autodoc/source/ary/idl/i_typedef.cxx | 3
autodoc/source/ary/idl/ia_ce.cxx | 3
autodoc/source/ary/idl/ia_ce.hxx | 3
autodoc/source/ary/idl/ia_type.cxx | 5
autodoc/source/ary/idl/ia_type.hxx | 3
autodoc/source/ary/idl/is_ce.cxx | 3
autodoc/source/ary/idl/is_ce.hxx | 3
autodoc/source/ary/idl/is_type.cxx | 3
autodoc/source/ary/idl/is_type.hxx | 3
autodoc/source/ary/idl/it_builtin.cxx | 3
autodoc/source/ary/idl/it_builtin.hxx | 3
autodoc/source/ary/idl/it_ce.cxx | 3
autodoc/source/ary/idl/it_ce.hxx | 3
autodoc/source/ary/idl/it_explicit.cxx | 3
autodoc/source/ary/idl/it_explicit.hxx | 3
autodoc/source/ary/idl/it_named.hxx | 2
autodoc/source/ary/idl/it_sequence.cxx | 3
autodoc/source/ary/idl/it_sequence.hxx | 3
autodoc/source/ary/idl/it_tplparam.cxx | 3
autodoc/source/ary/idl/it_tplparam.hxx | 3
autodoc/source/ary/idl/it_xnameroom.cxx | 3
autodoc/source/ary/idl/it_xnameroom.hxx | 3
autodoc/source/ary/inc/cpp_internalgate.hxx | 3
autodoc/source/ary/inc/cross_refs.hxx | 4
autodoc/source/ary/inc/idl_internalgate.hxx | 3
autodoc/source/ary/inc/idsort.hxx | 3
autodoc/source/ary/inc/loc_internalgate.hxx | 3
autodoc/source/ary/inc/nametreenode.hxx | 3
autodoc/source/ary/inc/reposy.hxx | 3
autodoc/source/ary/inc/sci_impl.hxx | 3
autodoc/source/ary/inc/slots.hxx | 3
autodoc/source/ary/inc/sorted_idset.hxx | 4
autodoc/source/ary/inc/sortedids.hxx | 3
autodoc/source/ary/inc/store/s_base.hxx | 3
autodoc/source/ary/inc/store/s_iterator.hxx | 3
autodoc/source/ary/inc/store/s_storage.hxx | 3
autodoc/source/ary/inc/traits_impl.hxx | 3
autodoc/source/ary/info/all_dts.cxx | 2
autodoc/source/ary/info/all_tags.cxx | 2
autodoc/source/ary/info/ci_attag.cxx | 2
autodoc/source/ary/info/ci_text.cxx | 2
autodoc/source/ary/kernel/ary_disp.cxx | 3
autodoc/source/ary/kernel/cessentl.cxx | 3
autodoc/source/ary/kernel/namesort.cxx | 3
autodoc/source/ary/kernel/qualiname.cxx | 3
autodoc/source/ary/kernel/reposy.cxx | 3
autodoc/source/ary/kernel/slots.cxx | 3
autodoc/source/ary/loc/loc_dir.cxx | 3
autodoc/source/ary/loc/loc_file.cxx | 3
autodoc/source/ary/loc/loc_filebase.cxx | 3
autodoc/source/ary/loc/loc_root.cxx | 3
autodoc/source/ary/loc/loc_traits.cxx | 3
autodoc/source/ary/loc/loca_le.cxx | 3
autodoc/source/ary/loc/loca_le.hxx | 3
autodoc/source/ary/loc/locs_le.cxx | 3
autodoc/source/ary/loc/locs_le.hxx | 3
autodoc/source/ary_i/kernel/ci_atag2.cxx | 2
autodoc/source/ary_i/kernel/ci_text2.cxx | 2
autodoc/source/ary_i/kernel/d_token.cxx | 8
autodoc/source/display/html/aryattrs.cxx | 3
autodoc/source/display/html/aryattrs.hxx | 3
autodoc/source/display/html/cfrstd.cxx | 3
autodoc/source/display/html/chd_udk2.cxx | 3
autodoc/source/display/html/cre_link.cxx | 3
autodoc/source/display/html/cre_link.hxx | 3
autodoc/source/display/html/dsply_cl.cxx | 3
autodoc/source/display/html/dsply_cl.hxx | 3
autodoc/source/display/html/dsply_da.cxx | 3
autodoc/source/display/html/dsply_da.hxx | 3
autodoc/source/display/html/dsply_op.cxx | 3
autodoc/source/display/html/dsply_op.hxx | 3
autodoc/source/display/html/easywri.cxx | 2
autodoc/source/display/html/easywri.hxx | 2
autodoc/source/display/html/hd_chlst.cxx | 3
autodoc/source/display/html/hd_chlst.hxx | 3
autodoc/source/display/html/hd_docu.cxx | 4
autodoc/source/display/html/hd_docu.hxx | 3
autodoc/source/display/html/hdimpl.cxx | 3
autodoc/source/display/html/hdimpl.hxx | 3
autodoc/source/display/html/html_kit.cxx | 2
autodoc/source/display/html/html_kit.hxx | 3
autodoc/source/display/html/nav_main.cxx | 2
autodoc/source/display/html/nav_main.hxx | 3
autodoc/source/display/html/navibar.cxx | 3
autodoc/source/display/html/navibar.hxx | 3
autodoc/source/display/html/opageenv.cxx | 5
autodoc/source/display/html/opageenv.hxx | 3
autodoc/source/display/html/outfile.cxx | 3
autodoc/source/display/html/outfile.hxx | 3
autodoc/source/display/html/pagemake.cxx | 2
autodoc/source/display/html/pagemake.hxx | 3
autodoc/source/display/html/pm_aldef.cxx | 3
autodoc/source/display/html/pm_aldef.hxx | 3
autodoc/source/display/html/pm_base.cxx | 2
autodoc/source/display/html/pm_base.hxx | 2
autodoc/source/display/html/pm_class.cxx | 2
autodoc/source/display/html/pm_class.hxx | 2
autodoc/source/display/html/pm_help.cxx | 2
autodoc/source/display/html/pm_help.hxx | 2
autodoc/source/display/html/pm_index.cxx | 3
autodoc/source/display/html/pm_index.hxx | 3
autodoc/source/display/html/pm_namsp.cxx | 3
autodoc/source/display/html/pm_namsp.hxx | 2
autodoc/source/display/html/pm_start.cxx | 2
autodoc/source/display/html/pm_start.hxx | 2
autodoc/source/display/html/protarea.cxx | 2
autodoc/source/display/html/protarea.hxx | 2
autodoc/source/display/html/strconst.hxx | 2
autodoc/source/display/idl/hfi_constgroup.cxx | 2
autodoc/source/display/idl/hfi_constgroup.hxx | 2
autodoc/source/display/idl/hfi_doc.cxx | 5
autodoc/source/display/idl/hfi_doc.hxx | 3
autodoc/source/display/idl/hfi_enum.cxx | 3
autodoc/source/display/idl/hfi_enum.hxx | 2
autodoc/source/display/idl/hfi_globalindex.cxx | 3
autodoc/source/display/idl/hfi_globalindex.hxx | 2
autodoc/source/display/idl/hfi_hierarchy.cxx | 3
autodoc/source/display/idl/hfi_hierarchy.hxx | 3
autodoc/source/display/idl/hfi_interface.cxx | 3
autodoc/source/display/idl/hfi_interface.hxx | 3
autodoc/source/display/idl/hfi_linklist.cxx | 2
autodoc/source/display/idl/hfi_linklist.hxx | 2
autodoc/source/display/idl/hfi_method.cxx | 123 ---
autodoc/source/display/idl/hfi_method.hxx | 2
autodoc/source/display/idl/hfi_module.cxx | 3
autodoc/source/display/idl/hfi_module.hxx | 2
autodoc/source/display/idl/hfi_navibar.cxx | 2
autodoc/source/display/idl/hfi_navibar.hxx | 3
autodoc/source/display/idl/hfi_property.cxx | 4
autodoc/source/display/idl/hfi_property.hxx | 3
autodoc/source/display/idl/hfi_service.cxx | 2
autodoc/source/display/idl/hfi_service.hxx | 2
autodoc/source/display/idl/hfi_singleton.cxx | 3
autodoc/source/display/idl/hfi_singleton.hxx | 2
autodoc/source/display/idl/hfi_siservice.cxx | 3
autodoc/source/display/idl/hfi_siservice.hxx | 2
autodoc/source/display/idl/hfi_struct.cxx | 3
autodoc/source/display/idl/hfi_struct.hxx | 3
autodoc/source/display/idl/hfi_tag.cxx | 3
autodoc/source/display/idl/hfi_tag.hxx | 3
autodoc/source/display/idl/hfi_typedef.cxx | 3
autodoc/source/display/idl/hfi_typedef.hxx | 2
autodoc/source/display/idl/hfi_typetext.cxx | 5
autodoc/source/display/idl/hfi_typetext.hxx | 2
autodoc/source/display/idl/hfi_xrefpage.cxx | 3
autodoc/source/display/idl/hfi_xrefpage.hxx | 3
autodoc/source/display/idl/hi_ary.cxx | 16
autodoc/source/display/idl/hi_ary.hxx | 2
autodoc/source/display/idl/hi_display.cxx | 13
autodoc/source/display/idl/hi_env.cxx | 3
autodoc/source/display/idl/hi_env.hxx | 2
autodoc/source/display/idl/hi_factory.cxx | 2
autodoc/source/display/idl/hi_factory.hxx | 3
autodoc/source/display/idl/hi_linkhelper.cxx | 3
autodoc/source/display/idl/hi_linkhelper.hxx | 7
autodoc/source/display/idl/hi_main.cxx | 2
autodoc/source/display/idl/hi_main.hxx | 3
autodoc/source/display/inc/cfrstd.hxx | 2
autodoc/source/display/inc/html/chd_udk2.hxx | 3
autodoc/source/display/inc/idl/hi_display.hxx | 2
autodoc/source/display/inc/toolkit/hf_docentry.hxx | 3
autodoc/source/display/inc/toolkit/hf_funcdecl.hxx | 36 -
autodoc/source/display/inc/toolkit/hf_linachain.hxx | 3
autodoc/source/display/inc/toolkit/hf_navi_main.hxx | 2
autodoc/source/display/inc/toolkit/hf_navi_sub.hxx | 2
autodoc/source/display/inc/toolkit/hf_title.hxx | 3
autodoc/source/display/inc/toolkit/htmlfactory.hxx | 2
autodoc/source/display/inc/toolkit/htmlfile.hxx | 2
autodoc/source/display/inc/toolkit/out_node.hxx | 3
autodoc/source/display/inc/toolkit/out_position.hxx | 3
autodoc/source/display/inc/toolkit/out_tree.hxx | 3
autodoc/source/display/inc/toolkit/outputstack.hxx | 2
autodoc/source/display/kernel/displfct.cxx | 2
autodoc/source/display/kernel/displfct.hxx | 2
autodoc/source/display/toolkit/hf_docentry.cxx | 3
autodoc/source/display/toolkit/hf_funcdecl.cxx | 48 -
autodoc/source/display/toolkit/hf_linachain.cxx | 3
autodoc/source/display/toolkit/hf_navi_main.cxx | 2
autodoc/source/display/toolkit/hf_navi_sub.cxx | 2
autodoc/source/display/toolkit/hf_title.cxx | 3
autodoc/source/display/toolkit/htmlfile.cxx | 2
autodoc/source/display/toolkit/out_node.cxx | 3
autodoc/source/display/toolkit/out_position.cxx | 3
autodoc/source/display/toolkit/out_tree.cxx | 3
autodoc/source/display/toolkit/outputstack.cxx | 2
autodoc/source/exes/adc_uni/adc_cl.cxx | 172 -----
autodoc/source/exes/adc_uni/adc_cmd.hxx | 3
autodoc/source/exes/adc_uni/adc_cmd_parse.cxx | 4
autodoc/source/exes/adc_uni/adc_cmd_parse.hxx | 3
autodoc/source/exes/adc_uni/adc_cmds.cxx | 3
autodoc/source/exes/adc_uni/adc_cmds.hxx | 3
autodoc/source/exes/adc_uni/adc_msg.cxx | 3
autodoc/source/exes/adc_uni/cmd_run.cxx | 336 ----------
autodoc/source/exes/adc_uni/cmd_run.hxx | 3
autodoc/source/exes/adc_uni/cmd_sincedata.cxx | 3
autodoc/source/exes/adc_uni/cmd_sincedata.hxx | 3
autodoc/source/exes/adc_uni/main.cxx | 2
autodoc/source/exes/adc_uni/makefile.mk | 4
autodoc/source/inc/adc_cl.hxx | 2
autodoc/source/inc/adc_msg.hxx | 3
autodoc/source/inc/docu_node_ids.hxx | 3
autodoc/source/inc/estack.hxx | 10
autodoc/source/inc/luxenum.hxx | 2
autodoc/source/inc/manip.hxx | 2
autodoc/source/inc/precomp.h | 3
autodoc/source/inc/prprpr.hxx | 3
autodoc/source/inc/tools/filecoll.hxx | 2
autodoc/source/inc/tools/tkpchars.hxx | 2
autodoc/source/mkinc/fullcpp.mk | 3
autodoc/source/parser/adoc/a_rdocu.cxx | 2
autodoc/source/parser/adoc/adoc_tok.cxx | 2
autodoc/source/parser/adoc/cx_a_std.cxx | 2
autodoc/source/parser/adoc/cx_a_sub.cxx | 2
autodoc/source/parser/adoc/docu_pe.cxx | 2
autodoc/source/parser/adoc/prs_adoc.cxx | 2
autodoc/source/parser/adoc/tk_attag.cxx | 29
autodoc/source/parser/adoc/tk_docw.cxx | 2
autodoc/source/parser/cpp/all_toks.cxx | 3
autodoc/source/parser/cpp/all_toks.hxx | 8
autodoc/source/parser/cpp/c_dealer.cxx | 4
autodoc/source/parser/cpp/c_dealer.hxx | 2
autodoc/source/parser/cpp/c_rcode.cxx | 6
autodoc/source/parser/cpp/c_rcode.hxx | 2
autodoc/source/parser/cpp/cpp_pe.cxx | 2
autodoc/source/parser/cpp/cpp_pe.hxx | 2
autodoc/source/parser/cpp/cpp_tok.hxx | 2
autodoc/source/parser/cpp/cx_base.cxx | 2
autodoc/source/parser/cpp/cx_base.hxx | 2
autodoc/source/parser/cpp/cx_c_pp.cxx | 2
autodoc/source/parser/cpp/cx_c_pp.hxx | 2
autodoc/source/parser/cpp/cx_c_std.cxx | 2
autodoc/source/parser/cpp/cx_c_std.hxx | 2
autodoc/source/parser/cpp/cx_c_sub.cxx | 3
autodoc/source/parser/cpp/cx_c_sub.hxx | 2
autodoc/source/parser/cpp/cxt2ary.cxx | 3
autodoc/source/parser/cpp/cxt2ary.hxx | 3
autodoc/source/parser/cpp/defdescr.cxx | 2
autodoc/source/parser/cpp/defdescr.hxx | 3
autodoc/source/parser/cpp/fevnthdl.hxx | 2
autodoc/source/parser/cpp/icprivow.cxx | 3
autodoc/source/parser/cpp/icprivow.hxx | 3
autodoc/source/parser/cpp/pe_base.cxx | 2
autodoc/source/parser/cpp/pe_base.hxx | 3
autodoc/source/parser/cpp/pe_class.cxx | 11
autodoc/source/parser/cpp/pe_class.hxx | 9
autodoc/source/parser/cpp/pe_defs.cxx | 2
autodoc/source/parser/cpp/pe_defs.hxx | 2
autodoc/source/parser/cpp/pe_enum.cxx | 2
autodoc/source/parser/cpp/pe_enum.hxx | 8
autodoc/source/parser/cpp/pe_enval.cxx | 2
autodoc/source/parser/cpp/pe_enval.hxx | 2
autodoc/source/parser/cpp/pe_expr.cxx | 29
autodoc/source/parser/cpp/pe_expr.hxx | 2
autodoc/source/parser/cpp/pe_file.cxx | 3
autodoc/source/parser/cpp/pe_file.hxx | 19
autodoc/source/parser/cpp/pe_funct.cxx | 2
autodoc/source/parser/cpp/pe_funct.hxx | 3
autodoc/source/parser/cpp/pe_ignor.cxx | 2
autodoc/source/parser/cpp/pe_ignor.hxx | 2
autodoc/source/parser/cpp/pe_namsp.cxx | 2
autodoc/source/parser/cpp/pe_namsp.hxx | 2
autodoc/source/parser/cpp/pe_param.cxx | 2
autodoc/source/parser/cpp/pe_param.hxx | 3
autodoc/source/parser/cpp/pe_tpltp.cxx | 3
autodoc/source/parser/cpp/pe_tpltp.hxx | 2
autodoc/source/parser/cpp/pe_tydef.cxx | 2
autodoc/source/parser/cpp/pe_tydef.hxx | 3
autodoc/source/parser/cpp/pe_type.cxx | 2
autodoc/source/parser/cpp/pe_type.hxx | 2
autodoc/source/parser/cpp/pe_vafu.cxx | 2
autodoc/source/parser/cpp/pe_vafu.hxx | 3
autodoc/source/parser/cpp/pe_vari.cxx | 2
autodoc/source/parser/cpp/pe_vari.hxx | 2
autodoc/source/parser/cpp/pev.hxx | 2
autodoc/source/parser/cpp/preproc.cxx | 2
autodoc/source/parser/cpp/preproc.hxx | 2
autodoc/source/parser/cpp/prs_cpp.cxx | 2
autodoc/source/parser/cpp/sdocdist.hxx | 3
autodoc/source/parser/cpp/sfscope.hxx | 3
autodoc/source/parser/cpp/sownstck.hxx | 2
autodoc/source/parser/cpp/srecover.hxx | 2
autodoc/source/parser/cpp/tkp_cpp.cxx | 2
autodoc/source/parser/cpp/tkp_cpp.hxx | 2
autodoc/source/parser/cpp/tokintpr.hxx | 3
autodoc/source/parser/inc/adoc/a_rdocu.hxx | 2
autodoc/source/parser/inc/adoc/adoc_tok.hxx | 2
autodoc/source/parser/inc/adoc/atokdeal.hxx | 2
autodoc/source/parser/inc/adoc/cx_a_std.hxx | 2
autodoc/source/parser/inc/adoc/cx_a_sub.hxx | 2
autodoc/source/parser/inc/adoc/docu_pe.hxx | 3
autodoc/source/parser/inc/adoc/prs_adoc.hxx | 2
autodoc/source/parser/inc/adoc/tk_attag.hxx | 2
autodoc/source/parser/inc/adoc/tk_docw.hxx | 2
autodoc/source/parser/inc/adoc/tokintpr.hxx | 2
autodoc/source/parser/inc/cpp/ctokdeal.hxx | 2
autodoc/source/parser/inc/cpp/prs_cpp.hxx | 3
autodoc/source/parser/inc/doc_deal.hxx | 3
autodoc/source/parser/inc/semantic/callf.hxx | 2
autodoc/source/parser/inc/semantic/parseenv.hxx | 2
autodoc/source/parser/inc/semantic/sub_pe.hxx | 2
autodoc/source/parser/inc/semantic/sub_peu.hxx | 2
autodoc/source/parser/inc/tokens/parseinc.hxx | 2
autodoc/source/parser/inc/tokens/stmstarr.hxx | 2
autodoc/source/parser/inc/tokens/stmstate.hxx | 2
autodoc/source/parser/inc/tokens/stmstfin.hxx | 2
autodoc/source/parser/inc/tokens/tkp.hxx | 8
autodoc/source/parser/inc/tokens/tkpcontx.hxx | 2
autodoc/source/parser/inc/tokens/tkpstama.hxx | 2
autodoc/source/parser/inc/tokens/tokdeal.hxx | 22
autodoc/source/parser/inc/tokens/token.hxx | 2
autodoc/source/parser/inc/tokens/tokproct.hxx | 4
autodoc/source/parser/inc/x_docu.hxx | 3
autodoc/source/parser/inc/x_parse.hxx | 3
autodoc/source/parser/kernel/parsefct.cxx | 2
autodoc/source/parser/kernel/parsefct.hxx | 2
autodoc/source/parser/kernel/x_docu.cxx | 3
autodoc/source/parser/kernel/x_parse.cxx | 3
autodoc/source/parser/semantic/parseenv.cxx | 3
autodoc/source/parser/tokens/stmstarr.cxx | 2
autodoc/source/parser/tokens/stmstate.cxx | 2
autodoc/source/parser/tokens/stmstfin.cxx | 2
autodoc/source/parser/tokens/tkp.cxx | 2
autodoc/source/parser/tokens/tkpcontx.cxx | 2
autodoc/source/parser/tokens/tkpstama.cxx | 8
autodoc/source/parser/tokens/tokdeal.cxx | 2
autodoc/source/parser_i/idl/cx_idlco.cxx | 2
autodoc/source/parser_i/idl/cx_sub.cxx | 3
autodoc/source/parser_i/idl/distrib.cxx | 2
autodoc/source/parser_i/idl/parsenv2.cxx | 3
autodoc/source/parser_i/idl/pe_attri.cxx | 3
autodoc/source/parser_i/idl/pe_const.cxx | 2
autodoc/source/parser_i/idl/pe_enum2.cxx | 2
autodoc/source/parser_i/idl/pe_evalu.cxx | 2
autodoc/source/parser_i/idl/pe_excp.cxx | 3
autodoc/source/parser_i/idl/pe_file2.cxx | 2
autodoc/source/parser_i/idl/pe_func2.cxx | 2
autodoc/source/parser_i/idl/pe_iface.cxx | 3
autodoc/source/parser_i/idl/pe_property.cxx | 2
autodoc/source/parser_i/idl/pe_selem.cxx | 3
autodoc/source/parser_i/idl/pe_servi.cxx | 2
autodoc/source/parser_i/idl/pe_singl.cxx | 28
autodoc/source/parser_i/idl/pe_struc.cxx | 3
autodoc/source/parser_i/idl/pe_tydf2.cxx | 2
autodoc/source/parser_i/idl/pe_type2.cxx | 3
autodoc/source/parser_i/idl/pe_vari2.cxx | 2
autodoc/source/parser_i/idl/pestate.cxx | 2
autodoc/source/parser_i/idl/semnode.cxx | 3
autodoc/source/parser_i/idl/tk_const.cxx | 2
autodoc/source/parser_i/idl/tk_ident.cxx | 2
autodoc/source/parser_i/idl/tk_keyw.cxx | 2
autodoc/source/parser_i/idl/tk_punct.cxx | 3
autodoc/source/parser_i/idl/tkp_uidl.cxx | 2
autodoc/source/parser_i/idl/unoidl.cxx | 14
autodoc/source/parser_i/idoc/cx_docu2.cxx | 2
autodoc/source/parser_i/idoc/cx_dsapi.cxx | 2
autodoc/source/parser_i/idoc/docu_pe2.cxx | 2
autodoc/source/parser_i/idoc/tk_atag2.cxx | 2
autodoc/source/parser_i/idoc/tk_docw2.cxx | 2
autodoc/source/parser_i/idoc/tk_html.cxx | 2
autodoc/source/parser_i/idoc/tk_xml.cxx | 2
autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx | 2
autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx | 3
autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/distrib.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx | 3
autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx | 6
autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx | 3
autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx | 27
autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx | 3
autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/pestate.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/semnode.hxx | 37 -
autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx | 3
autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx | 4
autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx | 2
autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx | 2
autodoc/source/parser_i/inc/semantic/parsenv2.hxx | 2
autodoc/source/parser_i/inc/tokens/stmstar2.hxx | 2
autodoc/source/parser_i/inc/tokens/stmstat2.hxx | 2
autodoc/source/parser_i/inc/tokens/stmstfi2.hxx | 2
autodoc/source/parser_i/inc/tokens/tkp2.hxx | 4
autodoc/source/parser_i/inc/tokens/tkpcont2.hxx | 2
autodoc/source/parser_i/inc/tokens/tkpstam2.hxx | 2
autodoc/source/parser_i/inc/tokens/token2.hxx | 2
autodoc/source/parser_i/inc/x_parse2.hxx | 3
autodoc/source/parser_i/tokens/stmstar2.cxx | 2
autodoc/source/parser_i/tokens/stmstat2.cxx | 2
autodoc/source/parser_i/tokens/stmstfi2.cxx | 2
autodoc/source/parser_i/tokens/tkp2.cxx | 2
autodoc/source/parser_i/tokens/tkpcont2.cxx | 2
autodoc/source/parser_i/tokens/tkpstam2.cxx | 3
autodoc/source/parser_i/tokens/x_parse2.cxx | 2
autodoc/source/tools/filecoll.cxx | 2
autodoc/source/tools/tkpchars.cxx | 4
cosv/inc/cosv/bstream.hxx | 2
cosv/inc/cosv/comdline.hxx | 2
cosv/inc/cosv/comfunc.hxx | 3
cosv/inc/cosv/commandline.hxx | 3
cosv/inc/cosv/csv_env.hxx | 3
cosv/inc/cosv/csv_ostream.hxx | 2
cosv/inc/cosv/csv_precomp.h | 3
cosv/inc/cosv/datetime.hxx | 2
cosv/inc/cosv/dirchain.hxx | 2
cosv/inc/cosv/file.hxx | 2
cosv/inc/cosv/mbstream.hxx | 2
cosv/inc/cosv/openclose.hxx | 2
cosv/inc/cosv/persist.hxx | 2
cosv/inc/cosv/ploc.hxx | 3
cosv/inc/cosv/ploc_dir.hxx | 2
cosv/inc/cosv/plocroot.hxx | 2
cosv/inc/cosv/std_outp.hxx | 2
cosv/inc/cosv/str_types.hxx | 3
cosv/inc/cosv/streamstr.hxx | 3
cosv/inc/cosv/string.hxx | 3
cosv/inc/cosv/stringdata.hxx | 2
cosv/inc/cosv/tpl/dyn.hxx | 3
cosv/inc/cosv/tpl/funcall.hxx | 3
cosv/inc/cosv/tpl/processor.hxx | 3
cosv/inc/cosv/tpl/range.hxx | 3
cosv/inc/cosv/tpl/swelist.hxx | 2
cosv/inc/cosv/tpl/tpltools.hxx | 3
cosv/inc/cosv/tpl/vvector.hxx | 5
cosv/inc/cosv/x.hxx | 2
cosv/prj/build.lst | 2
cosv/prj/d.lst | 14
cosv/source/comphelp/badcast.cxx | 2
cosv/source/fullcpp.mk | 5
cosv/source/inc/precomp.h | 2
cosv/source/service/comdline.cxx | 2
cosv/source/service/comfunc.cxx | 2
cosv/source/service/commandline.cxx | 3
cosv/source/service/csv_ostream.cxx | 2
cosv/source/service/datetime.cxx | 2
cosv/source/service/std_outp.cxx | 2
cosv/source/storage/dirchain.cxx | 3
cosv/source/storage/file.cxx | 2
cosv/source/storage/makefile.mk | 16
cosv/source/storage/mbstream.cxx | 2
cosv/source/storage/persist.cxx | 2
cosv/source/storage/ploc.cxx | 3
cosv/source/storage/ploc_dir.cxx | 2
cosv/source/storage/plocroot.cxx | 2
cosv/source/strings/str_types.cxx | 2
cosv/source/strings/streamstr.cxx | 3
cosv/source/strings/string.cxx | 3
cosv/source/unittest/file_ut.cxx | 2
cosv/source/unittest/makefile.mk | 8
cosv/source/unittest/string_ut.cxx | 68 --
cosv/source/unittest/ut.hxx | 2
cosv/source/unittest/ut_main.cxx | 2
odk/cfgWin.js | 24
odk/configure.pl | 11
odk/docs/install.html | 20
odk/examples/CLI/CSharp/Spreadsheet/Makefile | 18
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile | 4
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx | 3
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx | 3
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx | 3
odk/examples/DevelopersGuide/Components/CppComponent/Makefile | 8
odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx | 8
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 110 ---
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx | 2
odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile | 4
odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 8
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx | 8
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx | 8
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx | 8
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx | 4
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx | 34 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx | 3
odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx | 2
odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java | 2
odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml | 2
odk/examples/DevelopersGuide/Forms/DataAwareness.java | 2
odk/examples/DevelopersGuide/Forms/KeyGenerator.java | 2
odk/examples/DevelopersGuide/Forms/URLHelper.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c | 5
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h | 3
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c | 3
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h | 3
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile | 4
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx | 32
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx | 29
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx | 4
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 51 -
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx | 13
odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx | 3
odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx | 3
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx | 6
odk/examples/DevelopersGuide/Text/TextDocuments.java | 2
odk/examples/DevelopersGuide/UCB/Helper.java | 4
odk/examples/OLE/activex/SOActiveX.cpp | 4
odk/examples/OLE/activex/SOActiveX.h | 2
odk/examples/OLE/activex/SOComWindowPeer.cpp | 5
odk/examples/OLE/activex/SOComWindowPeer.h | 3
odk/examples/OLE/activex/StdAfx2.cpp | 3
odk/examples/OLE/activex/StdAfx2.h | 3
odk/examples/OLE/activex/resource.h | 2
odk/examples/OLE/activex/so_activex.cpp | 2
odk/examples/cpp/DocumentLoader/DocumentLoader.cxx | 11
odk/examples/cpp/DocumentLoader/Makefile | 4
odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx | 2
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx | 9
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h | 9
odk/examples/cpp/complextoolbarcontrols/Makefile | 4
odk/examples/cpp/complextoolbarcontrols/MyJob.cxx | 9
odk/examples/cpp/complextoolbarcontrols/MyJob.h | 2
odk/examples/cpp/complextoolbarcontrols/MyListener.cxx | 53 -
odk/examples/cpp/complextoolbarcontrols/MyListener.h | 3
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 125 +--
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h | 3
odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx | 2
odk/examples/cpp/complextoolbarcontrols/exports.cxx | 30
odk/examples/cpp/counter/Makefile | 8
odk/examples/cpp/counter/counter.cxx | 3
odk/examples/cpp/counter/countermain.cxx | 4
odk/examples/cpp/remoteclient/Makefile | 4
odk/examples/cpp/remoteclient/remoteclient.cxx | 34 -
odk/examples/java/Inspector/SourceCodeGenerator.java | 2
odk/examples/java/ToDo/ToDo.java | 2
odk/inc/pch/precompiled_odk.cxx | 2
odk/inc/pch/precompiled_odk.hxx | 2
odk/pack/checkinc/makefile.mk | 2
odk/pack/copying/makefile.mk | 12
odk/prj/d.lst | 6
odk/setsdkenv_unix | 2
odk/setsdkenv_unix.csh.in | 25
odk/setsdkenv_unix.sh.in | 27
odk/setsdkenv_windows.template | 20
odk/settings/settings.mk | 43 -
odk/settings/stdtarget.mk | 9
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 18
odk/source/com/sun/star/lib/loader/Loader.java | 4
odk/source/unoapploader/unx/makefile.mk | 2
odk/source/unoapploader/unx/unoapploader.c | 24
odk/source/unoapploader/win/unoapploader.c | 13
odk/source/unowinreg/win/makefile.mk | 2
odk/source/unowinreg/win/unowinreg.cxx | 3
odk/util/makefile.pmk | 53 -
odk/util/odk_rules.pmk | 5
udm/inc/udm/html/htmlitem.hxx | 2
udm/inc/udm/xml/xmlitem.hxx | 3
udm/prj/d.lst | 14
udm/source/html/htmlitem.cxx | 3
udm/source/inc/precomp.h | 3
udm/source/unittest/makefile.mk | 77 --
udm/source/unittest/test.cxx | 112 ---
udm/source/xml/xmlitem.cxx | 3
unodevtools/inc/unodevtools/options.hxx | 3
unodevtools/inc/unodevtools/typemanager.hxx | 28
unodevtools/prj/d.lst | 6
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 94 +-
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 6
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 46 -
unodevtools/source/skeletonmaker/javatypemaker.cxx | 7
unodevtools/source/skeletonmaker/makefile.mk | 10
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 44 -
unodevtools/source/skeletonmaker/skeletoncommon.hxx | 22
unodevtools/source/skeletonmaker/skeletoncpp.hxx | 2
unodevtools/source/skeletonmaker/skeletonjava.hxx | 2
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 3
unodevtools/source/unodevtools/options.cxx | 3
unodevtools/source/unodevtools/typeblob.cxx | 13
unodevtools/source/unodevtools/typemanager.cxx | 5
unodevtools/unodevtools.pmk | 10
806 files changed, 2434 insertions(+), 2122 deletions(-)
New commits:
commit 25b0e3e84e32b8e9388c2bcf7bab29c58c681910
Merge: 7498d9b... c71cf20...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 18:49:45 2011 +0200
Merge branch 'master' into feature/gnumake4
commit c71cf20b074e93f01a5093d6ae886eeb14facd23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 14 15:51:46 2011 +0100
WaE: simple-minded windows compiler warning
diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx
index d98fc84..c209972 100644
--- a/autodoc/source/ary_i/kernel/d_token.cxx
+++ b/autodoc/source/ary_i/kernel/d_token.cxx
@@ -60,9 +60,8 @@ DT_TextToken::DisplayAt( DocumentationDisplay & o_rDisplay ) const
bool
DT_TextToken::IsWhiteOnly() const
{
- for ( const char * it = sText.c_str();
- static_cast<UINT8>(*it) > 32;
- ++it )
+ const char *it = sText.c_str();
+ while (static_cast<UINT8>(*it++) > 32)
{
return false;
}
commit b8872e7aa198c65c47dc95c0baf8489ea5f9be5a
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 14 00:21:31 2011 +0300
Don't build skeletonmaker for iOS
diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk
index 6205a1f..ec0a382 100644
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ b/unodevtools/source/skeletonmaker/makefile.mk
@@ -35,6 +35,12 @@ LIBTARGET := NO
ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+
+.IF "$(OS)" == "IOS"
+all:
+ @echo No point in build-time executables for this platform
+.ENDIF
+
.INCLUDE : $(PRJ)$/unodevtools.pmk
APP1TARGET = $(TARGET)
commit 5147b840b68a4c048d0c2dc356a7b4138f694bd7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 10 17:21:16 2011 +0300
Build specifically for x86 only as that is what cli_cppuhelper.dll is
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 15dc049..a8dba1c 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -12,7 +12,7 @@ include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
#include $(SETTINGS)/dk.mk
-CSC_FLAGS = -warnaserror+ -noconfig
+CSC_FLAGS = -warnaserror+ -noconfig -platform:x86
VBC_FLAGS = -warnaserror+
ifeq "$(DEBUG)" "yes"
CC_FLAGS+=-Zi -MT
commit 0a4ce2c48098f5c42587bd0aae279339252fa509
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 10 17:17:05 2011 +0300
Fix typo, add some comments, use build env if possible to find cli_*.dll
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 14785e8..15dc049 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -1,5 +1,10 @@
# Builds the SpreadSheet examples of the Developers Guide.
+# This Makefile is supposed to be run by a GNU Make built for native
+# Windows Not the Cygwin GNU Make, not dmake, not Microsoft's NMAKE.
+# But yeah, that is what the setsdkenv_windows.bat file in
+# ../../../.. presumably tries to set up.
+
PRJ = ../../../..
SETTINGS = $(PRJ)/settings
@@ -21,7 +26,14 @@ endif
THIS_OUT_MISC = $(OUT_MISC)/csharp_SpreadsheetExamples
SPREADSHEET_OUT:= $(OUT_BIN)/CSharp_SpreadsheetExamples
+
+ifneq "$(OUTDIR)" ""
+# We are running in a LO build environment, good
+CLI_LIB_LOCATION = $(OUTDIR)\bin
+else
+# Bad guess, but hey, this is how it was
CLI_LIB_LOCATION = $(PRJ)\cli
+endif
# Targets
.PHONY : ALL
@@ -54,7 +66,7 @@ ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe
.PHONY : Info
ifeq "$(OS)" "WIN"
-Info : SpreadsheetSample GenerateTableSample ViewSample
+Info : SpreadsheetSample GeneralTableSample ViewSample
@echo -------------------------------------------------------------------------------
@echo Please use one of the following commands to execute the examples!
@echo -
commit ff2c05d7b1411aeb67dc0ba415a1ec50db6331d6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 10 15:35:08 2011 +0300
This makefile is for a standard Make, so use TABs
diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
index ba99722..938ab34 100644
--- a/odk/settings/stdtarget.mk
+++ b/odk/settings/stdtarget.mk
@@ -10,7 +10,8 @@ endif
install: $(REGISTERFLAG)
$(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES)
- -$(MKDIR) $(subst /,$(PS),$(@D))
- -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
- echo flagged > $@
+# This is a makefile for a standard Make, so must be TABs below
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
+ $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+ echo flagged > $@
commit 5d578b73f96d95668493e9d51cde37b43e5fad8c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 10 15:34:37 2011 +0300
There is no dk.mk in settings
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index bae593f..14785e8 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -5,7 +5,7 @@ SETTINGS = $(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
-include $(SETTINGS)/dk.mk
+#include $(SETTINGS)/dk.mk
CSC_FLAGS = -warnaserror+ -noconfig
VBC_FLAGS = -warnaserror+
commit 053d3d6b3ab5d76c2b4b7b225718da5d01a75708
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Tue Jun 7 10:38:26 2011 +0100
Remove assert that caused a build error.
Actual error was:
comparison is always true due to limited range of data type
diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx
index 7a5e73d..2926573 100644
--- a/autodoc/source/display/html/hd_docu.cxx
+++ b/autodoc/source/display/html/hd_docu.cxx
@@ -182,8 +182,6 @@ Docu_Display::do_Process(const ary::doc::Documentation & i_rData)
void
Docu_Display::Display_StdTag( const StdTag & i_rData )
{
- csv_assert( uintt(i_rData.Std_Id()) < uintt(ary::info::C_eAtTag_NrOfClasses) );
-
const ary::info::DocuText::TokenList &
rText = i_rData.CText().Tokens();
typedef ary::info::DocuText::TokenList::const_iterator TokenIterator;
commit 6cdd3989638be9c72bd76a30ff9a9e492d3cd1c3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:28:00 2011 +0300
Drop %_EXT% which was always empty
diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst
index c73e559..99ad21d 100644
--- a/autodoc/prj/d.lst
+++ b/autodoc/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\bin\autodoc.exe %_DEST%\bin%_EXT%\autodoc.exe
-..\%__SRC%\bin\autodoc %_DEST%\bin%_EXT%\autodoc
+..\%__SRC%\bin\autodoc.exe %_DEST%\bin\autodoc.exe
+..\%__SRC%\bin\autodoc %_DEST%\bin\autodoc
diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst
index 229161c..496506b 100644
--- a/cosv/prj/d.lst
+++ b/cosv/prj/d.lst
@@ -1,8 +1,8 @@
-mkdir: %_DEST%\inc%_EXT%\cosv
-mkdir: %_DEST%\inc%_EXT%\cosv\tpl
+mkdir: %_DEST%\inc\cosv
+mkdir: %_DEST%\inc\cosv\tpl
-..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib
-..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a
-..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx
-..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h
-..\inc\cosv\tpl\*.hxx %_DEST%\inc%_EXT%\cosv\tpl\*.hxx
+..\%__SRC%\lib\cosv.lib %_DEST%\lib\cosv.lib
+..\%__SRC%\lib\libcosv.a %_DEST%\lib\libcosv.a
+..\inc\cosv\*.hxx %_DEST%\inc\cosv\*.hxx
+..\inc\cosv\*.h %_DEST%\inc\cosv\*.h
+..\inc\cosv\tpl\*.hxx %_DEST%\inc\cosv\tpl\*.hxx
diff --git a/odk/prj/d.lst b/odk/prj/d.lst
index 0af13f2..a9337ad 100644
--- a/odk/prj/d.lst
+++ b/odk/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\bin\odkcommon.zip %_DEST%\bin%_EXT%\odkcommon.zip
+..\%__SRC%\bin\odkcommon.zip %_DEST%\bin\odkcommon.zip
-..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin%_EXT%\uno_loader_classes.zip
+..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin\uno_loader_classes.zip
-..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin%_EXT%\odkexamples.zip
+..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin\odkexamples.zip
diff --git a/udm/prj/d.lst b/udm/prj/d.lst
index 150256d..5dfe7a1 100644
--- a/udm/prj/d.lst
+++ b/udm/prj/d.lst
@@ -1,9 +1,9 @@
-mkdir: %_DEST%\inc%_EXT%\udm
-mkdir: %_DEST%\inc%_EXT%\udm\html
-mkdir: %_DEST%\inc%_EXT%\udm\xml
+mkdir: %_DEST%\inc\udm
+mkdir: %_DEST%\inc\udm\html
+mkdir: %_DEST%\inc\udm\xml
-..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib
-..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a
-..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx
-..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx
+..\%__SRC%\lib\udm.lib %_DEST%\lib\udm.lib
+..\%__SRC%\lib\libudm.a %_DEST%\lib\libudm.a
+..\inc\udm\html\*.hxx %_DEST%\inc\udm\html\*.hxx
+..\inc\udm\xml\*.hxx %_DEST%\inc\udm\xml\*.hxx
diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst
index 0060b6b..f4be609 100644
--- a/unodevtools/prj/d.lst
+++ b/unodevtools/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin%_EXT%\uno-skeletonmaker.exe
-..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin%_EXT%\uno-skeletonmaker.pdb
+..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin\uno-skeletonmaker.exe
+..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin\uno-skeletonmaker.pdb
-..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin%_EXT%\uno-skeletonmaker
+..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin\uno-skeletonmaker
commit d5dfd654863461219cb1928ef65e788c69ca17af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 3 08:55:08 2011 +0100
tweak the odk example to be equivalent to the standard template
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index 1c5e49a..80be336 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -36,6 +36,7 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <rtl/uuid.h>
+#include <rtl/instance.hpp>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -172,24 +173,34 @@ Sequence< Type > MyService1Impl::getTypes()
seq[ 2 ] = ::cppu::UnoType< Reference< ::my_module::XSomething > >::get();
return seq;
}
-Sequence< sal_Int8 > MyService1Impl::getImplementationId()
- throw (RuntimeException)
+namespace
{
- static Sequence< sal_Int8 > * s_pId = 0;
- if (! s_pId)
+ // class to create an unique id
+ class UniqueIdInit
{
- // create unique id
- Sequence< sal_Int8 > id( 16 );
- ::rtl_createUuid( (sal_uInt8 *)id.getArray(), 0, sal_True );
- // guard initialization with some mutex
- ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
- if (! s_pId)
+ private:
+ ::com::sun::star::uno::Sequence< sal_Int8 > m_aSeq;
+ public:
+ UniqueIdInitIdInit() : m_aSeq(16)
{
- static Sequence< sal_Int8 > s_id( id );
- s_pId = &s_id;
+ rtl_createUuid( (sal_uInt8*)m_aSeq.getArray(), 0, sal_True );
}
- }
- return *s_pId;
+ const ::com::sun::star::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; }
+ };
+ //A multi-thread safe UniqueIdInitIdInit singleton wrapper
+ class theService1ImplImplementationId
+ : public rtl::Static< UniqueIdInitIdInit,
+ theService1ImplImplementationId >
+ {
+ };
+}
+Sequence< sal_Int8 > MyService1Impl::getImplementationId()
+ throw (RuntimeException)
+{
+ //create a singleton that generates a unique id on
+ //first initialization and returns the same one
+ //on subsequent calls.
+ return theService1ImplImplementationId::get().getSeq();
}
// XSomething implementation
commit c446251474c1bf11253ace6081aa8ffc68d18668
Merge: c0926e6... f9af907...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon May 30 13:12:16 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
commit f9af9077862b22428a957ee85293ff86778f6f4a
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:14 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit c0926e66a9bf53b3a08d5f508580c3396ad16748
Merge: 080fbc1... f805b5b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 24 15:03:19 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
commit 080fbc1948ea572460503aa4121fb057476ee10f
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:39:03 2011 +0300
Add the wntgcc directories
diff --git a/.gitignore b/.gitignore
index 6d3c54b..e9a4130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
/*/unxmac*.pro
/*/unxios?
/*/unxios?.pro
commit 18a4a5e86a79aa4e83bd75aa815d618294833f5b
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:34:12 2011 +0300
Add the unxios and unxand directories
diff --git a/.gitignore b/.gitignore
index 677805a..6d3c54b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,8 @@
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
-/*/unxmac*.pro
\ No newline at end of file
+/*/unxmac*.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
commit 773f91ca3f44506ae1e5ee9b327b68979796f4cf
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 18 03:37:46 2011 +0300
Check what compiler is used, not run-time platform
diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk
index ffbcb98..3103f63 100644
--- a/cosv/source/fullcpp.mk
+++ b/cosv/source/fullcpp.mk
@@ -31,7 +31,7 @@
# Has to be inlcuded AFTER settings.mk !
-.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
# RTTI
CFLAGS+= -GR
@@ -50,8 +50,7 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBU
.ENDIF
-.IF "$(OS)"=="LINUX"
+.IF "$(COM)"=="GCC"
# RTTI
CFLAGSCXX+= -frtti
.ENDIF
-
commit f697745730aa61d852388233a27e75f8f6f516ce
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 17 22:08:30 2011 +0200
Just 1 simple fix cppcheck warning
diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
index 84ab4b9..4979e2a 100644
--- a/autodoc/source/parser/cpp/c_rcode.cxx
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -139,7 +139,7 @@ CodeExplorer::CurToken() const
Cpp_PE &
CodeExplorer::CurEnv() const
{
- csv_assert(aEnvironments.size() > 0);
+ csv_assert(!aEnvironments.empty());
csv_assert(aEnvironments.back() != 0);
return *aEnvironments.back();
commit b053e3d9872dbd7e2e49ca8b1f32b15e2d56065c
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:48 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 77a19d3b0076210315219277d92191e80c4f2ad8
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:37 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit c7f08af261bc35aa06a6e2186265207153b6110c
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:44 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit 64307a91fcf9ebb84ede8f08d991e22a5789304a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun May 8 14:54:29 2011 +0200
Some cppcheck cleaning
diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx
index 2caa0d7..57c853a 100644
--- a/autodoc/source/ary/idl/ia_type.cxx
+++ b/autodoc/source/ary/idl/ia_type.cxx
@@ -127,7 +127,7 @@ TypeAdmin::lhf_CheckIn_TypeName( const String & i_sLocalName,
{
String sSearchLocalName( i_sLocalName );
if ( i_templateParameters != 0
- ? i_templateParameters->size() > 0
+ ? (!i_templateParameters->empty())
: false )
{
sSearchLocalName = MakeTemplateName(
diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx
index 07ee3db..017e022 100644
--- a/autodoc/source/display/idl/hfi_doc.cxx
+++ b/autodoc/source/display/idl/hfi_doc.cxx
@@ -165,7 +165,7 @@ HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu,
}
} // end for
- if (aSeeAlsosWithoutText.size() > 0)
+ if (!aSeeAlsosWithoutText.empty())
{
HF_IdlTag
aSeeAlsoTag(Env(), i_rScopeGivingCe);
diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx
index fd96d0a..e817144 100644
--- a/autodoc/source/display/idl/hfi_typetext.cxx
+++ b/autodoc/source/display/idl/hfi_typetext.cxx
@@ -740,7 +740,7 @@ void
HF_IdlTypeText::write_TemplateParameterList(
const std::vector<ary::idl::Type_id> & i_templateParameters ) const
{
- if (i_templateParameters.size() == 0)
+ if (i_templateParameters.empty())
return;
HF_IdlTypeText
diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
index 2ce39cb..1077c9c 100644
--- a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
+++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
@@ -220,7 +220,7 @@ void
Parse::do_clDefaultProject( opt_iter & it,
opt_iter itEnd )
{
- if ( aProjects.size() > 0 )
+ if ( !aProjects.empty() )
{
throw X_CommandLine( "Both, named projects and a default project, cannot be used together." );
}
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index 3ea8f88..72c6665 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -267,7 +267,6 @@ char* createCommandName( char* argv0 )
#ifndef AIX
Dl_info dl_info;
#endif
- int pos;
/* get the executable file name from argv0 */
prgname = argv0;
@@ -293,7 +292,7 @@ char* createCommandName( char* argv0 )
sep = strrchr( prgname, SEPARATOR );
if ( sep != NULL )
{
- pos = ++sep - prgname;
+ int pos = ++sep - prgname;
strncpy( cmdname, prgname, pos );
cmdname[ pos ] = '\0';
strcat( cmdname, CMDPREFIX );
commit b84bac859ec7c90b99a327685909d0fc18fd0bb5
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 3 23:02:44 2011 +0200
Change <file>.toURL() to <file>.toURI().toURL()
diff --git a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
index 63901b9..a6ca8d3 100644
--- a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
+++ b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
@@ -100,7 +100,7 @@ public class GraphicExportDemo
aProps[0].Value = "WMF";
*/
java.io.File destFile = new java.io.File(args[1]);
- java.net.URL destUrl = destFile.toURL();
+ java.net.URL destUrl = destFile.toURI().toURL();
aProps[1] = new PropertyValue();
aProps[1].Name = "URL";
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index caed82f..29b1125 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -1025,7 +1025,7 @@ public class FunctionHelper
// get file URL from the dialog
try
{
- sFileURL = aChooser.getSelectedFile().toURL().toExternalForm();
+ sFileURL = aChooser.getSelectedFile().toURI().toURL().toExternalForm();
}
catch( MalformedURLException ex )
{
diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java
index fad1be9..d226be4 100644
--- a/odk/examples/DevelopersGuide/Text/TextDocuments.java
+++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java
@@ -425,7 +425,7 @@ public class TextDocuments {
if ( xDoc != null ) {
sourceFile = new java.io.File(sOutputDir);
StringBuffer sStoreFileUrl = new StringBuffer();
- sStoreFileUrl.append(sourceFile.toURL().toString());
+ sStoreFileUrl.append(sourceFile.toURI().toURL().toString());
sStoreFileUrl.append("somepopularfileformat.doc");
storeDocComponent(xDoc, sStoreFileUrl.toString() );
diff --git a/odk/examples/DevelopersGuide/UCB/Helper.java b/odk/examples/DevelopersGuide/UCB/Helper.java
index dbba915..791302b 100644
--- a/odk/examples/DevelopersGuide/UCB/Helper.java
+++ b/odk/examples/DevelopersGuide/UCB/Helper.java
@@ -179,7 +179,7 @@ public class Helper {
try
{
File file = new File( systemPath );
- String url = file.toURL().toString();
+ String url = file.toURI().toURL().toString();
if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx
StringBuffer buf1 = new StringBuffer( "file:///" );
buf1.append( url.substring( 6 ) );
@@ -217,7 +217,7 @@ public class Helper {
buf.append( "resource-" );
buf.append( System.currentTimeMillis() );
File file = new File( buf.toString() );
- String url = file.toURL().toString();
+ String url = file.toURI().toURL().toString();
if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx
StringBuffer buf1 = new StringBuffer( "file:///" );
buf1.append( url.substring( 6 ) );
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java
index c9589e2..64bc781 100644
--- a/odk/source/com/sun/star/lib/loader/Loader.java
+++ b/odk/source/com/sun/star/lib/loader/Loader.java
@@ -178,7 +178,7 @@ public final class Loader {
if ( fJuh.exists() ) {
URL[] clurls = new URL[1];
try {
- clurls[0] = fJuh.toURL();
+ clurls[0] = fJuh.toURI().toURL();
ClassLoader cl = new CustomURLClassLoader( clurls );
Class c = cl.loadClass(
"com.sun.star.comp.helper.UnoInfo" );
@@ -237,7 +237,7 @@ public final class Loader {
StringTokenizer tokens = new StringTokenizer( data, delimiter );
while ( tokens.hasMoreTokens() ) {
try {
- urls.add( new File( tokens.nextToken() ).toURL() );
+ urls.add( new File( tokens.nextToken() ).toURI().toURL() );
} catch ( MalformedURLException e ) {
// don't add this class path entry to the list of class loader
// URLs
commit 4917c28603372248e4ef88787a8475547858c1b3
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:38 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit 9c29600084bb66155f97012e78ccc393d272158e
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Sun May 1 06:33:09 2011 +0200
Remove OS/2 support
diff --git a/unodevtools/unodevtools.pmk b/unodevtools/unodevtools.pmk
index 91fe33b..c2d119c 100755
--- a/unodevtools/unodevtools.pmk
+++ b/unodevtools/unodevtools.pmk
@@ -42,17 +42,7 @@ COMMONCPPLIBST=commoncpp.lib
COMMONJAVALIBST=commonjava.lib
.ENDIF
-.ELIF "$(GUI)"=="OS2"
-UNODEVTOOLSLIBDEPN=unodevtools.lib
-CODEMAKERLIBDEPN=codemaker.lib
-COMMONCPPLIBDEPN=commoncpp.lib
-COMMONJAVALIBDEPN=commonjava.lib
-UNODEVTOOLSLIBST=unodevtools.lib
-CODEMAKERLIBST=codemaker.lib
-COMMONCPPLIBST=commoncpp.lib
-COMMONJAVALIBST=commonjava.lib
.ELSE
-
UNODEVTOOLSLIBDEPN=libunodevtools.a
CODEMAKERLIBDEPN=libcodemaker.a
COMMONCPPLIBDEPN=libcommoncpp.a
commit f834b33c2a83726f59a81667317f4e57d2b3735a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon May 2 22:54:04 2011 +0200
Change <file>.toURL() to <file>.toURI().toURL()
diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java
index 7099dd9..7114095 100644
--- a/odk/examples/DevelopersGuide/Forms/URLHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java
@@ -47,7 +47,7 @@ public class URLHelper
String sFileURL = null;
try
{
- sFileURL = aSystemPath.toURL().toString();
+ sFileURL = aSystemPath.toURI().toURL().toString();
}
catch( MalformedURLException exWrong )
{
commit 5d0e89e96b949ace051bb8cfb90d8623ce792c60
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Apr 30 07:45:25 2011 -0700
Ignore .gitattributes
diff --git a/.gitignore b/.gitignore
index d7ad641..677805a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# backup and temporary files
*~
.*.sw[op]
+.gitattributes
# the build directories
/*/unxlng??
commit 3da53c71cfc17526a41d156043a5563866fc6024
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:16 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
commit b3084b9999c63a958bf3eb4578625f5c0d601fba
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Apr 21 15:14:11 2011 +0200
Easyhack: Add visibility markup to all component_get* functions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index a3ce7d5..f20fa49 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -194,11 +194,11 @@ void generateCompFunctions(std::ostream & o, const OString & nmspace)
<< " &::cppu::createSingleComponentFactory, 0, 0 },\n"
<< " { 0, 0, 0, 0, 0, 0 }\n};\n\n";
- o << "extern \"C\" void SAL_CALL component_getImplementationEnvironment(\n"
+ o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(\n"
<< " const char ** envTypeName, uno_Environment **)\n{\n"
<< " *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;\n}\n\n";
- o << "extern \"C\" void * SAL_CALL component_getFactory(\n"
+ o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(\n"
<< " const char * implName, void * serviceManager, void * registryKey)\n{\n"
<< " return ::cppu::component_getFactoryHelper(\n"
<< " implName, serviceManager, registryKey, entries);\n}\n\n";
commit f805b5bcbbfdf000284622ba2d47c3bd5d5c7b87
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 19 18:58:54 2011 +0200
Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit bf524d7f5f057f6b806d3c1fdd0a1bf22da11985
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Apr 13 11:06:58 2011 +0200
Even more OOo -> LO changes (in comments now)
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index c7b1b23..398599d 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -788,22 +788,22 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+ "REM Example: set OO_SDK_NAME=libreoffice3.4_sdk\n" +
"set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" +
"set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org 3\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" +
"set OFFICE_BASE_HOME=" + office_base_home +
"\n\n" +
"REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" +
+ "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" +
"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
"\n\n" +
"REM Directory of the make command.\n" +
commit 6a3109bc28a9ad304e9739362ecbad31fed50621
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Apr 13 11:06:58 2011 +0200
Even more OOo -> LO changes (in comments now)
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index c7b1b23..398599d 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -788,22 +788,22 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+ "REM Example: set OO_SDK_NAME=libreoffice3.4_sdk\n" +
"set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" +
"set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org 3\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" +
"set OFFICE_BASE_HOME=" + office_base_home +
"\n\n" +
"REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" +
+ "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" +
"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
"\n\n" +
"REM Directory of the make command.\n" +
commit ac1c3e5bb04087f60b774354569cc6f77cb1a50a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Apr 13 10:58:52 2011 +0200
Some more OOo -> LO changes
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index ef4e0b6..c7b1b23 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -2,8 +2,8 @@
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\LibreOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\LibreOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
var sDirDotNet1_1 = "v1.1.4322";
commit d7cf7dd95ad76974628f5654536e060d9e4818a6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Apr 13 10:58:52 2011 +0200
Some more OOo -> LO changes
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index ef4e0b6..c7b1b23 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -2,8 +2,8 @@
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\LibreOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\LibreOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
var sDirDotNet1_1 = "v1.1.4322";
commit fd0b24e4d70ee52402bf8b02430bd1d1504ed033
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 11 17:53:05 2011 +0200
Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)
commit 5b33ac0c39e661bdd9373fe44d702d6c8e31f230
Merge: f6f48c3... 27da27c...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 19:25:25 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 27da27c6396b7b6c8599ce72b3d6ed53c0e7b501
Merge: d0ee00c... f779dac...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 19:08:20 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
odk/settings/settings.mk
diff --cc odk/settings/settings.mk
index e4fc05a,3d67ee5..bbd18ee
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@@ -568,6 -569,15 +570,10 @@@ CPPUHELPERLIB=-luno_cppuhelper$(COMID
SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
+ ifeq "$(STLPORT)" "yes"
-ifeq "$(STLPORT_VER)" "500"
-STLPORTLIB=-lstlport
-else
-STLPORTLIB=-lstlport_gcc$(STLDEBUG)
+ endif
+ else
+ STLPORTLIB=
-endif
EMPTYSTRING=
PATH_SEPARATOR=:
commit f6f48c360b7c62b8aaac57a29b30c2457b48502c
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:26:11 2011 +0200
LibreOffice-3.5 development started in master
Branch "libreoffice-3-4" has been created. Further changes in master
will be used for LibreOffice-3.5 release.
commit d0ee00c0419c281131dd2c47b908c20cd0dd529a
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:13:16 2011 +0200
Branch libreoffice-3-4
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
+ only bug fixes are allowed
+ no approval needed during beta phase (two weeks after branch)
+ 1 approval needed during rc phase and for bugfix releases
+ 2 approvals with different/no affiliation needed for late features
+ regularly merged into master by a selected person when living
Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice at lists.freedesktop.org
If you want to build something cool, unstable, and risky, use master.
commit 7066231c114b4eb492453fd82633478faa6efe24
Author: Francisco Saito <saito at 4linux.com.br>
Date: Tue Mar 29 21:47:37 2011 +0100
drop bogus executable flag from idl/build/src and config files
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu b/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/Addon.xcu b/odk/examples/java/Inspector/Addon.xcu
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/Addons.xcu b/odk/examples/java/Inspector/Addons.xcu
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/ObjectInspector.xcs b/odk/examples/java/Inspector/ObjectInspector.xcs
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/ProtocolHandler.xcu b/odk/examples/java/Inspector/ProtocolHandler.xcu
old mode 100755
new mode 100644
commit 175d243af0b547dde02482eef63d95b746b02b77
Author: Francisco Saito <saito at 4linux.com.br>
Date: Tue Mar 29 21:44:51 2011 +0100
drop bogus executable flag from image files
diff --git a/odk/examples/java/Inspector/images/containers_16.png b/odk/examples/java/Inspector/images/containers_16.png
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/images/content_16.png b/odk/examples/java/Inspector/images/content_16.png
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/images/interfaces_16.png b/odk/examples/java/Inspector/images/interfaces_16.png
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/images/methods_16.png b/odk/examples/java/Inspector/images/methods_16.png
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/images/properties_16.png b/odk/examples/java/Inspector/images/properties_16.png
old mode 100755
new mode 100644
diff --git a/odk/examples/java/Inspector/images/services_16.png b/odk/examples/java/Inspector/images/services_16.png
old mode 100755
new mode 100644
commit d6c306cdf3e8673478900943b5e7f3945b53ae09
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Mar 24 09:40:09 2011 +0100
Some OOo -> LO changes (hopeful nothing broke with them)
diff --git a/odk/docs/install.html b/odk/docs/install.html
index baf9b5f..87a07ca 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -1,6 +1,6 @@
<html>
<head>
- <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Installation Guide</title>
+ <title>LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide</title>
<link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="Jürgen Schmidt">
@@ -36,16 +36,16 @@
<table class="table3">
<tr>
<td colspan="2">
- <p>The OpenOffice.org %PRODUCT_RELEASE% SDK comes with a set of development tools, base
+ <p>The LibreOffice %PRODUCT_RELEASE% SDK comes with a set of development tools, base
libraries, header files and helper class files that can be used to
- develop Java/C++ components, to embed the OpenOffice.org %PRODUCT_RELEASE% application in
+ develop Java/C++ components, to embed the LibreOffice %PRODUCT_RELEASE% application in
your own programs, or to use the API (scripting or remote control the
office). For a complete working environment, we have some additional
requirements:</p>
</td>
</tr>
<tr valign="top">
- <td><b>OpenOffice.org %PRODUCT_RELEASE% installation</td>
+ <td><b>LibreOffice %PRODUCT_RELEASE% installation</td>
<td class="content80">The SDK works on top of an existing office
installation and uses the same libraries as the office installation.</td>
</tr>
@@ -134,7 +134,7 @@
<li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b></a> -> for Windows2000/XP or later
</ul>
<p>The automatically started configure script (Unix and Windows2000/XP)
- requests relevant information and directories (SDK, StarOffice, GNU make,
+ requests relevant information and directories (SDK, LibreOffice, GNU make,
Java, C++), in order to prepare a working SDK environment. After completing the
configure script once, the newly created script is always used to set the
necessary environment variables for using the SDK and the required
@@ -154,8 +154,8 @@
<table class="table4">
<tr valign="top">
<td class="cell20"><b>OFFICE_HOME</b></td>
- <td class="cell80">Path to an existing StarOffice™ or OpenOffice.org
- base installation, e.g. "/opt/staroffice8". Be sure
+ <td class="cell80">Path to an existing LibreOffice
+ base installation, e.g. "/opt/libreoffice8". Be sure
that it is not a user installation only. Exactly one of OFFICE_HOME
and OO_SDK_URE_HOME must be set. The other should be either unset or
set to an empty value.</td>
@@ -172,14 +172,14 @@
<tr>
<td class="cell20"><b>OO_SDK_URE_HOME</b></td>
<td class="cell80">Path to an existing UNO Runtime Environment
- installation, e.g. "/opt/openoffice.org/ure". Exactly one of
+ installation, e.g. "/opt/libreoffice/ure". Exactly one of
OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
either unset or set to an empty value.</td>
</tr>
<tr>
<td class="cell20"><b>OO_SDK_HOME</b></td>
<td class="cell80">Path to the SDK root directory, e.g.
- "/usr/local/StarOffice8_SDK"</td>
+ "/opt/libreoffice/sdk"</td>
</tr>
<tr>
<td class="cell20"><b>OO_SDK_JAVA_HOME</b></td>
@@ -218,7 +218,7 @@
the output is generated in the SDK directory itself. If an output
directory is specified, the output is generated in a SDK dependent
subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR>
- /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>
+ /LibreOffice %PRODUCT_RELEASE%/LINUXExample.out)</td>
</tr>
<tr>
<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 26f3b33..cb2b0f5 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -8,16 +8,16 @@
setenv OO_SDK_NAME @OO_SDK_NAME@
# Installation directory of the Software Development Kit.
-# Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk
+# Example: setenv OO_SDK_HOME /opt/libreoffice/basis3.4/sdk
setenv OO_SDK_HOME '@OO_SDK_HOME@'
# Office installation directory.
-# Example: set OFFICE_HOME=/opt/openoffice.org3
+# Example: set OFFICE_HOME=/opt/libreoffice
set OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory.
-# Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure
+# Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure
setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@'
# Directory of the make command.
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index bf9761d..91bf164 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -9,16 +9,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/libreoffice/basis3.4/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice.org3
+# Example: OFFICE_HOME=/opt/libreoffice
OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
+# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
export OO_SDK_URE_HOME
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index d9dc4ec..fbe09f9 100755
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -3,22 +3,22 @@ REM This script sets all enviroment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=openoffice3.0_sdk
-set OO_SDK_NAME=openoffice.org3.0_sdk
+REM Example: set OO_SDK_NAME=libreoffice3.4_sdk
+set OO_SDK_NAME=libreoffice3.4_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk
set OO_SDK_HOME=
REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3
+REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
set OFFICE_HOME=
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3\Basis
set OFFICE_BASE_HOME=
REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE
set OO_SDK_URE_HOME=
REM Directory of the make command.
@@ -45,7 +45,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk
+REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk
set OO_SDK_OUT=
REM Automatic deployment
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index d6d1f99..6e9f201 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -27,8 +27,8 @@
# used for sdk common files
PRODUCT_RELEASE=3.4
-OFFICENAME=OpenOffice.org
-SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
+OFFICENAME=LibreOffice
+SDKDIRNAME=libreoffice$(PRODUCT_RELEASE)_sdk
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"
commit e04680dd0e41342e7bf613b1d50559825f1dd014
Merge: d9bfe2b... ca94c1b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 17:13:49 2011 +0100
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdk
commit d9bfe2b1782c2d0139553b592464061ae05af35d
Merge: 8cbadd8... e4d3fd6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 16:59:36 2011 +0100
Merge commit 'ooo/DEV300_m103'
Conflicts:
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
odk/examples/cpp/complextoolbarcontrols/exports.cxx
odk/examples/cpp/counter/countermain.cxx
odk/examples/cpp/remoteclient/remoteclient.cxx
odk/settings/settings.mk
diff --cc odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index af679d8,98bbab1..a6bc683
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@@ -83,13 -84,14 +84,14 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index 96dd4e5,b89d58b..84195a8
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@@ -116,13 -117,14 +117,14 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java
index 1653a76,a9ada93..5f78eb4
--- a/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java
+++ b/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java
@@@ -57,15 -57,19 +57,19 @@@ public class TestServiceProvide
return xSingleServiceFactory;
}
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey){
- boolean bregA= FactoryHelper.writeRegistryServiceInfo(
- TestComponentA.class.getName(),
- TestComponentA.__serviceName, regKey);
- boolean bregB= FactoryHelper.writeRegistryServiceInfo(
- TestComponentB.class.getName(),
- TestComponentB.__serviceName, regKey);
- return bregA && bregB;
- }
+ // This method not longer necessary since OOo 3.4 where the component registration
+ // was changed to passive component registration. For more details see
+ // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+
+ // public static boolean __writeRegistryServiceInfo(XRegistryKey regKey){
+ // boolean bregA= FactoryHelper.writeRegistryServiceInfo(
+ // TestComponentA.class.getName(),
+ // TestComponentA.__serviceName, regKey);
+ // boolean bregB= FactoryHelper.writeRegistryServiceInfo(
+ // TestComponentB.class.getName(),
+ // TestComponentB.__serviceName, regKey);
+ // return bregA && bregB;
-// }
++// }
}
diff --cc odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index ccfe4b6,f1451d3..7f77f1f
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@@ -91,13 -92,13 +92,13 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index 1a90ff6,8893869..919b852
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@@ -126,33 -127,36 +127,9 @@@ extern "C" SAL_DLLPUBLIC_EXPORT void SA
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- //---------------------------------------------------------------------------------------
- extern "C" sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
- {
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- SkeletonDriver::getImplementationName_Static(),
- SkeletonDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_FAIL("SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
- }
-// This method not longer necessary since OOo 3.4 where the component registration was
-// was changed to passive component registration. For more details see
-// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
-//---------------------------------------------------------------------------------------
-// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-// void* pServiceManager,
-// void* pRegistryKey
-// )
-// {
-// if (pRegistryKey)
-// try
-// {
-// Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-// REGISTER_PROVIDER(
-// SkeletonDriver::getImplementationName_Static(),
-// SkeletonDriver::getSupportedServiceNames_Static(), xKey);
-
-// return sal_True;
-// }
-// catch (::com::sun::star::registry::InvalidRegistryException& )
-// {
-// OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-// }
-
-// return sal_False;
-// }
//---------------------------------------------------------------------------------------
- extern "C" void* SAL_CALL component_getFactory(
+ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey)
diff --cc odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
index c3d4898,8a458d9..d9f70b2
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@@ -85,13 -86,13 +86,13 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index 57a7607,3d279d6..3925eef
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@@ -57,35 -56,38 +57,9 @@@ SAL_DLLPUBLIC_EXPORT void SAL_CALL comp
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- //==================================================================================================
- sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey )
- {
- if (pRegistryKey)
- {
- try
- {
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-
- const Sequence< OUString > & rSNL = FilterDetect_getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
- }
-// This method not longer necessary since OOo 3.4 where the component registration was
-// was changed to passive component registration. For more details see
-// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
-//==================================================================================================
-// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-// void * pServiceManager, void * pRegistryKey )
-// {
-// if (pRegistryKey)
-// {
-// try
-// {
-// Reference< XRegistryKey > xNewKey(
-// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
-// xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-
-// const Sequence< OUString > & rSNL = FilterDetect_getSupportedServiceNames();
-// const OUString * pArray = rSNL.getConstArray();
-// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
-// xNewKey->createKey( pArray[nPos] );
-
-// return sal_True;
-// }
-// catch (InvalidRegistryException &)
-// {
-// OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-// }
-// }
-// return sal_False;
-// }
//==================================================================================================
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = 0;
diff --cc odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 7ca8938,b57f4c7..112a181
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@@ -325,32 -324,36 +325,8 @@@ SAL_DLLPUBLIC_EXPORT void SAL_CALL comp
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey )
- {
- if (pRegistryKey)
- {
- try
- {
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
-
- const Sequence< OUString > & rSNL = getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
- }
-// This method not longer necessary since OOo 3.4 where the component registration was
-// was changed to passive component registration. For more details see
-// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
-//
-// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey )
-// {
-// if (pRegistryKey)
-// {
-// try
-// {
-// Reference< XRegistryKey > xNewKey(
-// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-// OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-
-// const Sequence< OUString > & rSNL = getSupportedServiceNames();
-// const OUString * pArray = rSNL.getConstArray();
-// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
-// xNewKey->createKey( pArray[nPos] );
-
-// return sal_True;
-// }
-// catch (InvalidRegistryException &)
-// {
-// OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-// }
-// }
-// return sal_False;
-// }
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = 0;
diff --cc odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
index a666549,a9e9877..1a96808
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@@ -82,13 -83,13 +83,13 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index 37ba2f7,0ef6c11..6401f73
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@@ -132,10 -118,10 +119,10 @@@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv
OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
exit(1);
}
-
+
// gets the server component context as property of the office component factory
Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
- xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
+ xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xComponentContext;
// gets the service manager from the office
Reference< XMultiComponentFactory > xMultiComponentFactoryServer(
diff --cc odk/examples/cpp/complextoolbarcontrols/Makefile
index bda6750,8e62233..06af1af
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@@ -92,13 -92,14 +92,14 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/cpp/complextoolbarcontrols/exports.cxx
index 6978c5d,c75471a..769ce98
--- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
@@@ -63,27 -62,30 +63,7 @@@ SAL_DLLPUBLIC_EXPORT void SAL_CALL comp
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- //==================================================================================================
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
- void* pRegistryKey )
- {
- if (!pRegistryKey)
- return sal_False;
-
- try
- {
- css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
- writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME , MYLISTENER_SERVICENAME );
- writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME );
-// This method not longer necessary since OOo 3.4 where the component registration was
-// was changed to passive component registration. For more details see
-// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
-//==================================================================================================
-// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
-// void* pRegistryKey )
-// {
-// if (!pRegistryKey)
-// return sal_False;
-
-// try
-// {
-// css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
-// writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME , MYLISTENER_SERVICENAME );
-// writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME );
- return sal_True;
- }
- catch(const css::registry::InvalidRegistryException&)
- { OSL_FAIL( "### InvalidRegistryException!" ); }
-
- return sal_False;
- }
-// return sal_True;
-// }
-// catch(const css::registry::InvalidRegistryException&)
-// { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-
-// return sal_False;
-// }
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName ,
diff --cc odk/examples/cpp/counter/Makefile
index 2ede77d,161145f..e74b472
--- a/odk/examples/cpp/counter/Makefile
+++ b/odk/examples/cpp/counter/Makefile
@@@ -115,13 -111,13 +111,13 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
@@@ -135,11 -131,22 +131,22 @@@ ifeq "$(OS)" "WIN
else
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB)
endif
+ $(COMP_SERVICES) :
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ @echo $(OSEP)?xml version="$(QM)1.0$(QM)" encoding="$(QM)UTF-8$(QM)"?$(CSEP) > $@
+ @echo $(OSEP)components xmlns="$(QM)http://openoffice.org/2010/uno-components$(QM)"$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)component loader="$(QM)com.sun.star.loader.SharedLibrary$(QM)" uri="$(QM)$(COMP_IMPL_NAME)$(QM)"$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)implementation name="$(QM)com.sun.star.comp.example.cpp.Counter$(QM)"$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)service name="$(QM)foo.Counter$(QM)"/$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)/implementation$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)/component$(CSEP) >> $@
+ @echo $(OSEP)/components$(CSEP) >> $@
+
- CppCounterExample : $(OUT_BIN)/countermain$(EXE_EXT) $(COMP_IMPL)
+ CppCounterExample : $(OUT_BIN)/countermain$(EXE_EXT) $(COMP_IMPL) $(COMP_SERVICES)
@echo --------------------------------------------------------------------------------
@echo Please use the following command to execute the example!
@echo -
diff --cc odk/examples/cpp/counter/countermain.cxx
index cce41e8,fce1715..8eb9f94
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@@ -111,15 -86,19 +87,18 @@@ SAL_IMPLEMENT_MAIN(
if (xCount.is())
{
- xCount->setCount( 42 );
- fprintf( stdout , "%d," , xCount->getCount() );
- fprintf( stdout , "%d," , xCount->increment() );
- fprintf( stdout , "%d\n" , xCount->decrement() );
+ xCount->setCount( 42 );
+ fprintf( stdout , "%d," , (int)xCount->getCount() );
+ fprintf( stdout , "%d," , (int)xCount->increment() );
+ fprintf( stdout , "%d\n" , (int)xCount->decrement() );
}
- }
- Reference< XComponent >::query( xContext )->dispose();
- return 0;
- }
+ Reference< XComponent >::query( xContext )->dispose();
+
+ } catch( Exception& e) {
+ printf("Error: caught exception:\n %s\n",
+ OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
+ exit(1);
+ }
- return 0;
-}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc odk/examples/cpp/remoteclient/Makefile
index 8d6b2bc,96b2ef9..97b0c3f
--- a/odk/examples/cpp/remoteclient/Makefile
+++ b/odk/examples/cpp/remoteclient/Makefile
@@@ -90,13 -84,13 +84,13 @@@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
- $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
+ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --cc odk/examples/cpp/remoteclient/remoteclient.cxx
index eb89be7,867c109..2db24c7
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@@ -233,34 -232,36 +233,9 @@@ SAL_DLLPUBLIC_EXPORT void SAL_CALL comp
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
//==================================================================================================
- sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey )
- {
- if (pRegistryKey)
- {
- try
- {
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
-
- const Sequence< OUString > & rSNL = getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
- }
- //==================================================================================================
- void * SAL_CALL component_getFactory(
-// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-// void * pServiceManager, void * pRegistryKey )
-// {
-// if (pRegistryKey)
-// {
-// try
-// {
-// Reference< XRegistryKey > xNewKey(
-// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-// OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-
-// const Sequence< OUString > & rSNL = getSupportedServiceNames();
-// const OUString * pArray = rSNL.getConstArray();
-// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
-// xNewKey->createKey( pArray[nPos] );
-
-// return sal_True;
-// }
-// catch (InvalidRegistryException &)
-// {
-// OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-// }
-// }
-// return sal_False;
-// }
-
-//==================================================================================================
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = 0;
diff --cc odk/settings/settings.mk
index 15b8af9,748800b..6dad32e
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@@ -78,10 -79,13 +78,11 @@@ EMPTYSTRING
PATH_SEPARATOR=;
# use this for release version
+ CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
ifeq "$(CPP_MANIFEST)" "true"
-#CC_FLAGS+=-EHa -Zc:wchar_t-
LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2"
else
-#CC_FLAGS+=
LINK_MANIFEST=
endif
ifeq "$(DEBUG)" "yes"
@@@ -324,7 -358,9 +335,8 @@@ endi
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux"
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
- CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
+ CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+ CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
# define for used compiler necessary for UNO
#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
@@@ -337,8 -373,10 +349,9 @@@ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,
ifeq "$(PROCTYPE)" "ppc"
LIBRARY_LINK_FLAGS+=-fPIC
endif
- COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
+ #COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
+ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
-#EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
@@@ -441,7 -489,9 +464,8 @@@ endi
SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
- CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
+ CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+ CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
CC_OUTPUT_SWITCH=-o
@@@ -556,14 -616,18 +585,16 @@@ endi
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
- CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
+ CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+ CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
CC_OUTPUT_SWITCH=-o
LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
- COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
+ #COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
+ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
-#EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
commit ca94c1bc1148a170bb33722657d5432a0fd70553
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Mar 22 11:11:01 2011 +0100
Trying to remove NODEFAULTLIB on Windows
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 15b8af9..0609353 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -97,9 +97,9 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu
CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
CC_OUTPUT_SWITCH=-Fo
-LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
+LIBRARY_LINK_FLAGS=/MD /DLL /DEBUGTYPE:cv
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
-EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib kernel32.lib
+EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /MD msvcrt.lib kernel32.lib
ifeq "$(DEBUG)" "yes"
LIBRARY_LINK_FLAGS+=/DEBUG
EXE_LINK_FLAGS+=/DEBUG
@@ -113,7 +113,7 @@ endif
# use this for release version
#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
-#LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL
+#LIBRARY_LINK_FLAGS=/MD /DLL
endif
commit 8cbadd8956403b0b0018592f78bf826cd76427c1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 19 14:11:43 2011 +0100
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index ecea9b2..1a90ff6 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -145,7 +145,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
}
catch (::com::sun::star::registry::InvalidRegistryException& )
{
- OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
+ OSL_FAIL("SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
}
return sal_False;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index b2efd83..57a7607 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -78,7 +78,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
catch (InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 1361e16..7ca8938 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -344,7 +344,7 @@ sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKe
}
catch (InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
index 72ddf40..6978c5d 100644
--- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
@@ -80,7 +80,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager
return sal_True;
}
catch(const css::registry::InvalidRegistryException&)
- { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
+ { OSL_FAIL( "### InvalidRegistryException!" ); }
return sal_False;
}
diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx
index 7aaa437..eb89be7 100644
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@ -254,7 +254,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
catch (InvalidRegistryException &)
{
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
commit 53a8b94d19bde151402a9096dc3eda0756b76302
Merge: f35cf85... 19571f7...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 17 17:00:48 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
commit f35cf85512e9cc07996fe8e3b708bcd70d255514
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:09:32 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 8b9558b..20543d5 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -878,7 +878,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
{
- OSL_ENSURE(0,"Not implemented yet!");
+ OSL_FAIL("Not implemented yet!");
throw SQLException();
return NULL;
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index fc840b2..1361e16 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -179,7 +179,7 @@ sal_Bool XFlatXml::importer(
catch( Exception &exc)
{
// something went wrong
- OSL_ENSURE(0, exc.Message);
+ OSL_FAIL(exc.Message);
return sal_False;
}
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index 4baf0b3..cf53d59 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -136,7 +136,7 @@ void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex,
}
break;
default:
- OSL_ENSURE( 0, "unsupported constant type" );
+ OSL_FAIL( "unsupported constant type" );
break;
}
@@ -798,7 +798,7 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr,
}
break;
default:
- OSL_ENSURE( 0, "unsupported type" );
+ OSL_FAIL( "unsupported type" );
break;
}
commit 19571f723dd63fb433e30c138098bc479b7bc46f
Merge: c7153c3... af67f29...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 8 22:34:23 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101':
sb138: #i116038# fresh implementation of binary URP bridge
dba34b: #i106807# use mysql instead of adabas now
sb126: #i112627# adapted SDK/DevGuide to configmgr re-write
Conflicts:
odk/util/makefile.pmk
diff --cc odk/setsdkenv_unix
index 6b0dd7c,31e0200..6b0dd7c
mode 100755,100644..100644
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
diff --cc odk/util/makefile.pmk
index db4a85f,deb4e6d..d198d31
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@@ -160,8 -188,8 +160,7 @@@ INCLUDETOPDIRLIST=
$(INCOUT)/uno \
$(INCOUT)/cppu \
$(INCOUT)/cppuhelper \
- $(INCOUT)/bridges \
- $(INCOUT)/registry \
- $(INCOUT)/stl
+ $(INCOUT)/registry
.IF "$(GUI)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)/systools
commit f779dacc689b152f5ede60bc8bfc6029c2e77d68
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 15:31:14 2011 +0100
Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit c7153c3aa1af28e80de7aefc184796b015049d79
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 2 20:36:58 2011 +0100
Remove "using namespace ::rtl"
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
index 31436a2..024c9f5 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
@@ -41,12 +41,13 @@
#include <my_module/MyService1.hpp>
#include <my_module/MyService2.hpp>
-using namespace rtl;
using namespace com::sun::star::uno;
-//namespace cssuno = ::com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
SAL_IMPLEMENT_MAIN()
{
try
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index 8b69531..12195ae 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -58,7 +58,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::document;
using namespace com::sun::star::lang;
@@ -71,6 +70,9 @@ using namespace com::sun::star::frame;
using namespace com::sun::star::container;
using namespace com::sun::star::ucb;
+using ::rtl::OUString;
+using ::rtl::OString;
+
OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
throw( RuntimeException )
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index 0f4f055..336aa4e 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -45,9 +45,11 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::bridge;
-using namespace rtl;
using namespace cppu;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
SAL_IMPLEMENT_MAIN()
{
// create the initial component context
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
index 3735b80..99f9da6 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
@@ -41,11 +41,12 @@
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index e214390..37ba2f7 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -58,7 +58,6 @@
#include <string.h>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
@@ -66,7 +65,8 @@ using namespace com::sun::star::bridge;
using namespace com::sun::star::frame;
using namespace com::sun::star::registry;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
//============================================================================
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index 932854c..e8aa20c 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -1470,7 +1470,7 @@ class UnoObjectDefinition{
public String getFinalHeaderStatements(){
String sReturn = "";
sReturn += "\nnamespace " + getCSSNameSpaceString() + " = com::sun::star;\n";
- sReturn += "using namespace rtl;\n";
+ sReturn += "using ::rtl::OUString;\n";
return sReturn;
}
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index fe91026..4baf0b3 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -52,9 +52,13 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
using namespace com::sun::star::reflection;
-using namespace rtl;
using namespace codemaker;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
namespace unodevtools {
void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex,
commit 40f8afbc768502da95d65f31f47237a25ef665a1
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Tue Feb 15 12:12:28 2011 +0000
dragonfly stuff
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
index 75b2516..c7519d8 100644
--- a/autodoc/source/mkinc/fullcpp.mk
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -35,7 +35,8 @@
.IF "$(GUI)"=="WNT"
CFLAGS+= -GR
.ENDIF
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
+ "$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
CFLAGSCXX+= -frtti
.ENDIF
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index 7a93bce..4ba98b1 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -43,7 +43,7 @@ LIBSALCPPRT=
LINK=$(CC)
.ENDIF
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="DRAGONFLY"
STDLIB= -ldl
.ENDIF
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 782f1e6..db4a85f 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -66,7 +66,8 @@ LIBOUT=$(SOLARLIBDIR)
MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || \
+ "$(OS)"=="AIX" || "$(OS)"=="DRAGONFLY"
MY_COPY=$(GNUCOPY)
MY_COPY_RECURSIVE=$(GNUCOPY) -r
.ELSE
@@ -133,6 +134,9 @@ DESTPLATFROM=netbsd
# FREEBSD
DESTPLATFROM=freebsd
+.ELIF "$(OS)"=="DRAGONFLY"
+DESTPLATFROM=dragonfly
+
.ELIF "$(OS)"=="MACOSX"
# MACOSX
DESTPLATFROM=macosx
commit 8cf803c664182e2aac245695fb3ddf36aac9b877
Author: Rene Engelhard <rene at debian.org>
Date: Fri Feb 11 22:42:48 2011 +0100
fix ODK settings.mk to only set STLPORTLIB if needed
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 188ff88..3d67ee5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -262,14 +262,12 @@ ifeq "$(PROCTYPE)" "powerpc"
PACKAGE_LIB_DIR=linux_powerpc.plt
UNOPKG_PLATFORM=Linux_PowerPC
JAVA_PROC_TYPE=ppc
-STLPORT=yes
endif
ifeq "$(PROCTYPE)" "sparc"
PACKAGE_LIB_DIR=linux_sparc.plt
UNOPKG_PLATFORM=Linux_SPARC
JAVA_PROC_TYPE=sparc
-STLPORT=yes
endif
ifeq "$(PROCTYPE)" "x86_64"
@@ -503,9 +501,11 @@ PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
UNOPKG_PLATFORM=kFreeBSD_x86_64
+STLPORT=no
else
PACKAGE_LIB_DIR=kfreebsd_x86.plt
UNOPKG_PLATFORM=kFreeBSD_x86
+STLPORT=no
endif
else
PLATFORM=freebsd
@@ -569,11 +569,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
+ifeq "$(STLPORT)" "yes"
ifeq "$(STLPORT_VER)" "500"
STLPORTLIB=-lstlport
else
STLPORTLIB=-lstlport_gcc$(STLDEBUG)
endif
+else
+STLPORTLIB=
+endif
EMPTYSTRING=
PATH_SEPARATOR=:
commit b3cc5de7947d7096316f93d3b16958cb6bccbf42
Author: Alfonso Eusebio <alfonso_eusebio at yahoo.co.uk>
Date: Thu Feb 10 08:25:35 2011 +0000
Remove obsolete Hyperlink Bar from sdk
Removed code related to hyperlink bar from sdk repo.
diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp
index ef9a2ef..cfadfca 100644
--- a/odk/examples/OLE/activex/SOActiveX.cpp
+++ b/odk/examples/OLE/activex/SOActiveX.cpp
@@ -49,14 +49,12 @@ OLECHAR* pSlotUrl[BARS_NUMBER] =
{L"slot:5910" // SID_TOGGLEFUNCTIONBAR
,L"slot:5920" // SID_TOGGLESTATUSBAR
,L"slot:6661" // SID_TOGGLE_MENUBAR
-// ,L"slot:10603" // SID_HYPERLINK_INSERT
};
OLECHAR* pSlotName[BARS_NUMBER] =
{L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR
,L"StatusBarVisible" // SID_TOGGLESTATUSBAR
,L"MenuBarVisible" // SID_TOGGLE_MENUBAR
-// ,L"InsertHyperlink" // SID_HYPERLINK_INSERT
};
commit 9341d3cb4aa25ed642a1e62e1633216b86d7ab3f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 16:20:25 2011 +0100
Trying to remove the stlport mention from the code
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index 8baea08..bf959e7 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -76,11 +76,11 @@ APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDK
.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
+APP1STDLIBS= $(COSVLIB) $(UDMLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
-APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv
+APP1STDLIBS= -Wl,-all_load -ludm -lcosv
.ELSE
APP1STDLIBS= -lcosv -ludm
.ENDIF
diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk
index 173ce8c..c736761 100644
--- a/cosv/source/unittest/makefile.mk
+++ b/cosv/source/unittest/makefile.mk
@@ -57,14 +57,6 @@ APP1TARGET= $(TARGET)
APP1STACK= 1000000
APP1OBJS= $(OBJ)$/ut_main.obj
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT)
-.ELSE
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS= $(LIBSTLPORT)
-.ENDIF
-.ENDIF
-
APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 0dc23d2..ef4e0b6 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -31,7 +31,6 @@ stdout.WriteLine("\n" +
" NOTE: This script is working only for Windows 2000, Windows XP or newer versions!\n");
var oo_sdk_name=WshSysEnv("OO_SDK_NAME");
-var stldebug="";
var oo_sdk_home=getSdkHome();
var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
@@ -121,10 +120,6 @@ function getSdkHome()
continue;
}
- if (aFileSystemObject.FileExists(sHome + "\\lib\\stlport_vc71_stldebug.lib")) {
- stldebug="_stldebug";
- }
-
return sHome;
}
}
@@ -841,11 +836,6 @@ function writeBatFile(fdir, file)
"REM Example: set SDK_AUTO_DEPLOYMENT=YES\n" +
"set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
"\n\n" +
- "set STLDEBUG=" + stldebug + "\n" +
- "REM check stlport lib in 4NT shell\n" +
- "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
- "REM set STLDEBUG=_stldebug\n" +
- "REM )\n\n" +
"REM Check installation path for the Office Development Kit.\n" +
"if not defined OO_SDK_HOME (\n" +
" echo Error: the variable OO_SDK_HOME is missing!\n" +
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index c542956..af679d8 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -83,13 +83,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list